Merge "b/2310373 Change string from Start/Stop Scan to Start/Stop scan"