Merge "Protect against multiple starts of device index job" into pi-dev am: 15700cb779
am: 679ad8e041

Change-Id: Ie7e29bc63d5f1f2f57d6a55225e14faf85d64b18