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

Change-Id: I8047eba3d935b7113a1719e39a09c10a140446e4