Merge "Don't include password on default encryption command" into mnc-dr-dev