Manual cherry-pick of ag/554094. Fixes linter errors.

Change-Id: I8abf1c4caf1449b460ad6a79c32b9f531377238f
1 file changed