am e8cbb421: am 5f3c715e: am 7f623dec: Merge "Set up crypto for user directories in init."

* commit 'e8cbb421cd28ec754923a88a919557ee5b174411':
  Set up crypto for user directories in init.