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

Change-Id: I8a570589c85c8d6b1f327b5df341d31d4aaff5b6