Improved cancellability of indexer.

Change-Id: I194e5b135f1f58501fb3345ca373feef23832c97
9 files changed