Code review cleanup

Fix various nits in a code review cleanup per ag/23732466

Bug: 286921148
Test: builds
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5c0ba41b7220881a7e37830615393cd603489455)
Merged-In: Ie98cd3f7605b0768a8a3cfe92a93f53a5a4d172f
Change-Id: Ie98cd3f7605b0768a8a3cfe92a93f53a5a4d172f
7 files changed