Followup from ag/10056177
Also cleans up a few small nits.
Test: atest
Bug: 112656837
Change-Id: I116b8f70df62b7c37c02325d54660624aa7bd78b
(cherry picked from commit a5c6f2e07a)
Followup from ag/10056177
Also cleans up a few small nits.
Test: atest
Bug: 112656837
Change-Id: I116b8f70df62b7c37c02325d54660624aa7bd78b
(cherry picked from commit a5c6f2e07a)