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

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