am b5f1e878: Fix build breakage.

* commit 'b5f1e878d1bc245b676a1a2504c30d21a311bf6c':
  Fix build breakage.