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

* commit 'cd004d2d0117243908b71b2b4c7036d79de5344c':
  Fix build.