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

Change-Id: I8e42b3f3b54b86f1bc7b2d3dc29973d96b7eb3a5