am ca6ae474: Merge "Fix minor style issues"

* commit 'ca6ae4740a6d8b24ea909c04a4de184fddc1df23':
  Fix minor style issues