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

Change-Id: I9d1edb6bb4e58bbe2b2378499b67ec1b7ebbf0f5