Merge "Updating accepted HMAC key sizes"