Merge "Revert "Securely encrypt the master key""