am 9235ed31: Merge "Fix build - style issues."

* commit '9235ed3182eb19d04240b0a4367481ef2d9a25a7':
  Fix build - style issues.