am 3d5a4240: Merge "Fix build."

* commit '3d5a42408ca24f86b8b81697b20012736cb48c2b':
  Fix build.