Merge "Do not perform device index before device provision." into pi-dev