am 9d58ec78: am cd004d2d: am 2ed09d44: Merge "Fix build."

* commit '9d58ec78b33296325982e1b87edcb54d0fb7a012':
  Fix build.