Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev am: 8cfb1a95da
am: fb19563972

Change-Id: I80322c13e9fb5926432ea660f0b143f9aa78e315