Merge "Added check for misprovisioned Pixel 2 device." into pi-dev