Merge "Wipe device on policy error" into nyc-dev