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

Change-Id: I09c905f0a7f54e3b24b94793d14f46ad9c56cf3c