Revert "Support abortScan"

This reverts commit 77732670f190b8bebb496478c34f157b546bdbed.

Change-Id: I4f6304740fd6c4248ac7f56655bbc15ccf0a9dcb
5 files changed