Support abortScan am: 77732670f1
am: 36889eb2d7

Change-Id: Ib1fdb3d216feb49c95b4f5acc89c2f97bb1ed7e5