am 4aa9da3f: Merge "Build fix."

* commit '4aa9da3f32d8e97968f4a627e03f7fcf041270a7':
  Build fix.