Merge "Fix the NetworkScanHelperTest testcase." into rvc-dev am: d33b66304c
am: a2fea961c2
am: f58b07ae72
Change-Id: I2600b0cc513cc2efb10e7f4f7489ea8bab4a866c
This commit is contained in: