am 00786076: Merge "Don\'t reboot after default encrypting" into lmp-dev

* commit '00786076cd6a3a32a42f95b4813ea807321b3fda':
  Don't reboot after default encrypting