Merge "Fix VTS errors of the network scan API" into oc-dr1-dev am: 6bba7c9ca4
am: b7af89f838

Change-Id: Id401f0154d24764dc1309e0984b1b310d5a05d2d