Codestyle fixups to satisfy presubmits
am: c73fdc1575

Change-Id: Id77036d30c8e5767420e7d840120f7bf0a419a44