am dd0b7b9c: am f4d7d950: Merge "Fix build: style issue."

* commit 'dd0b7b9c01c13b6f9ab4c285becd3b4efe456a46':
  Fix build: style issue.