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

Change-Id: Ida8be5c1e8f34a8fad520964b1a7104f9744efc1