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