Merge "enable instant apps" into nyc-mr1-dev
am: 6b3965a5df

Change-Id: Ifc46e841af8eb8f0a1522bec2ed7ba265f0a3f4e