am 2ed7af23: am 7326ff0a: Merge "Fix build, missing spaces around =/<."

* commit '2ed7af23676ee4b65740f8116b25e1acf258cb0f':
  Fix build, missing spaces around =/<.