Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: e8604065d6
am: f30fa1c861
am: f90f7cf31b
Change-Id: If740b309c96cfacb4a91da2b2d5771db566de791
This commit is contained in: