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

Change-Id: I6d6bdd04eaceeb3dcb1e19487a7c4c44d3b08ec4