Bug 515560: Avoid indexer race condition by joining the indexer

Change-Id: I13bd33adba4eb790fae0c31d2c1378e19a59f4ff
22 files changed