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

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