am 47687a46: Merge "Build fix."

* commit '47687a4643b2d8f950a280a5e1298c277da127aa':
  Build fix.