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

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