Minor code cleanup.

Address comments in prior review.

Bug: 192104306
Test: Compiles & graphics work

Change-Id: I4a6a5b9e5c4aa2d4cf3e72a8450b79f9ccfb2157
3 files changed