Merge "Optionally let the instant app into disambig" into oc-dev
am: 1f1d60c5a1

Change-Id: I78725fadab5bb7222f9d4528d21b22d881df45a1