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

Change-Id: I443bd4a96e616616e4608f1e9a8c5d8554647e56