Merge "Merge "Wipe device on policy error" into nyc-dev am: 8a59fa8524 am: 71bac3fa4b" into nyc-mr1-dev-plus-aosp
am: 5f53f6e1cd

* commit '5f53f6e1cd010fb07c2d2336e2f6ba1deb6be29a':

Change-Id: Ibe40d68ede4e6a2ef6454bc6bd751ed1658cc92d