Merge "Revert "Create auxiliary info for local instant apps"" into oc-dev