Revert "Support abortScan" am: e2cfd0257c
am: 395d92eb80

Change-Id: I77c0506b9e277e643784386fc9b44bd55dcc26dd