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

Change-Id: I181cb62756b16971b126c2174eea58788dd5bfea