We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

Reviewed in person with @tbosch

TODO: ref #4417

Error messages: take previous and following 2 lines, instead of -1- and +10 chars

Entities: lt, gt, nbsp

Merging PR #5264 on behalf of @vsavkin to branch presubmit-vsavkin-pr-5264.

Merging PR #5264 on behalf of @alxhub to branch presubmit-alxhub-pr-5264.

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

_{This action has been performed automatically by a bot.}