Merge "Wipe device on policy error" into nyc-dev am: 8a59fa8524
am: 71bac3fa4b

* commit '71bac3fa4b519ff9aa537a3ef6b7242b5c8f848c':
  Wipe device on policy error

Change-Id: Ie2eac0c6570a9c714f4966c054e9b41b36c09053