Merge "Merge "Protect instant apps from full apps" into oc-dev am: 4972aa30bf  -s ours am: 266e587f6b  -s ours"