Fix google3 lint errors

Fix: 180032747
Test: Manual
Change-Id: I2068c2788685dd927316d1f52657bcde8c7f398b
21 files changed