[automerger skipped] Merge "Loose startNetworkScan cases" am: 248276659c
am: b943809bc0  -s ours

Change-Id: I31580cadd14b56953c729aaec0408eb5e5b221ee