Merge "Catch IllegalArgumentException on NetworkScan.stopScan" am: 84c2b6a843
am: b4b64bbbdd

Change-Id: Ic2bcbc4e0ed9a0154699da43b504c93847f4b513