Merge "Merge "Clarify startScan API on how to get results" into oc-dev am: 78f3a0f7 am: ef863368" into oc-dr1-dev-plus-aosp