Cleanup: Minor style fixes.

(cherry picked from commit 49d905456fd6cf730abdddb49df84d6032b0a419)

Change-Id: I199447f03ce33d79007e62e23ccf683ed4249f97
5 files changed