Merge "Encrypted File Systems part 3. Recovery changes."