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

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