Merge "Follow up to 'Remove support for the deprecated Key header'"