Merge " Add VTS code for the network scan API" am: 6ef70c9040 am: a944299fdb am: a3c3f5f0f8  -s ours
am: 1a641fff3d  -s ours

Change-Id: I7d931a5e5cb5deed1d89de8faafbad0471a66f89