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

Change-Id: If32ba7f368b6e8011152662adab2d9a06935f140