Merge "Add wrapped key support for metadata encryption"