am aa2e7f77: am 2a4f610a: (-s ours) Manual cherry-pick of ag/554094. Fixes linter errors.

* commit 'aa2e7f778399d74ac5647fbade43829049d55608':
  Manual cherry-pick of ag/554094. Fixes linter errors.