am ccd830ad: am 1ba8eb6b: am 8e012107: Merge "Fix the build"

* commit 'ccd830adad7c1723331b6f3d2122b910088dd377':
  Fix the build