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

* commit '68521fd7ce5e87a4e752569b5691b75d441e8a48':
  Don't include password on default encryption command