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