am 7c789575: Merge "Revert "Set up crypto for user directories in init.""

* commit '7c7895755cf23140f08b7416ceff006dbbf7a411':
  Revert "Set up crypto for user directories in init."