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

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