Merge "Set up user directory crypto in init." into mnc-dr-dev