am 80edaa67: am 24c089a8: Fix build.

* commit '80edaa676bd59409f8a82e12c035bee96e653004':
  Fix build.