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

Change-Id: I63d6a84c78f52d9ee20bdf719ac4edbca34fb44d