Merge "Don\'t include password on default encryption command" into mnc-dr-dev am: 68521fd7ce
am: 29c5fb2646

* commit '29c5fb2646dd0bc0f2fa8b3b98f0893d7d57469b':
  Don't include password on default encryption command