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

Change-Id: I8d29e4778235d7bc30a0b2c541007854e64a9214