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

Change-Id: If34872eb4ddb4b51f4518834aac92a0ef64f163e