Merge "Do not perform device index before device provision." into pi-dev
am: 1fe4512596

Change-Id: I2cc6689cd6c80df36c4565fc48b396abb4b16288