Codestyle fixups to satisfy presubmits am: c73fdc1575 am: f6f20b5403
am: 7da02ca12f

Change-Id: I8a0fcff90ff113c497bc96bb5e830e3b10f3694d