Merge "Revert "Support Speck encryption.""