am 5ea690eb: Merge "Fix build."

* commit '5ea690eb838841c99ae1fb5b2b36fd6a0bdbab23':
  Fix build.