Fix minor style issues

Follow-up to I082aa20041c933ae5fc78f12ddf491d1c775c683.

Change-Id: Ia334b192bdba231b0b9a2b2f2d7d18fcff2ca836
3 files changed