Automatic merge from submit-queue Fix comments and typo in the error message **What this PR does / why we need it**: This PR fixes outdated comments and typo in the error message. **Release note**: ```release-note NONE ``` CC @simo5