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

Change-Id: I4e48ba4c05d764322ad2e953430b8b02c7c09712