Merge "Create auxiliary info for local instant apps" into oc-dev
am: d55670bcf5

Change-Id: Ia0fe6ae25879711ae0c9cf92a71607a5d7c5f4dc