Fix google3 "java code clarity" issue

Bug: 162268101
Bug: 170343703
Test: Manual
Change-Id: Ie0b99c189f8c2b20d084651cdde024ef91e19803
Merged-In: Ie0b99c189f8c2b20d084651cdde024ef91e19803
3 files changed