Merge "Revert "Enable metadata encryption""