Merge "Catch the RuntimeException for stopScan()" into pi-dev am: ed9ee780a4
am: e6be615ca4

Change-Id: I959e50e0213426cc655776728dc2c677b8887f0f