Fix formatting in a few files

Change-Id: Ia5175afe82b142d9e18c01c546610202c630588e
3 files changed