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

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