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

Change-Id: Iab8691835c77b3d65ed33b1065946cc6fae64208