Merge "Use metadata_key_dir instead of metadata_encryption"