Merge "Allow instant app resolution for any user" into oc-dev am: e7b806e9d2
am: 455b742bb6

Change-Id: I12b658529a580c1d29e7dc99f60b87ff048706a3