Merge "Make sure encryption type is set on first boot" into nyc-dev am: 439034b8cc
am: dba928fabd

* commit 'dba928fabdd25b2834d6178c99a1c9557f89fa7c':
  Make sure encryption type is set on first boot