am 39b80a76: am c21b79e2: Fix build breakage.

* commit '39b80a765cda05173bc04af8f3d9ebda6e8b98a0':
  Fix build breakage.