Merge "Code cleanup to conform to style guide / linter."
am: f5ff8f0661

Change-Id: If6c04c711b328c114d04ea8b4aa01414a715b7a2