Merge "Do not throw RuntimeException from stopScan()."
am: 7ac5deaf38

Change-Id: I64e0486f26d6bc9e468cf0c69ec6ada50889940b