am b2d7ca7c: am fd2c1307: Merge "Fix build."

* commit 'b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718':
  Fix build.