am 4ebd855b: Fix build.

Merge commit '4ebd855bb7362d45833dc811f2622fcc788dec17'

* commit '4ebd855bb7362d45833dc811f2622fcc788dec17':
  Fix build.