Merge "Fix-up coding style" am: 4a534ebc91
am: cfcaca92d1

Change-Id: Ib10ba26be56b2c520bb764d9e961e539f2444c1f