Merge "Add response schema validation for encryption types"