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

Change-Id: I9db208192f129cc3ab7b574edb6025700c781ce9