Merge "Loose startNetworkScan cases"
am: 248276659c

Change-Id: Id5163f00756cc62fbb9bd76620b23e581da72c43