More robust handing of indexer cancellation.

Change-Id: I5c2baf7fab8560a0cc11bfc74994b6e9135e7cce
1 file changed