Merge "Add startNetworkScan 1.4 API." am: 312dce0ec0
am: 4eda2ffad6

Change-Id: Ief859900a547ead4552c4ca7e73f829a4bef7085