am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password...
am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev
* commit '09ba0da8':
Add a checkbox option to 'require password to decrypt'