am b2d41569: Fix build.

Merge commit 'b2d415693482f58e104a99376cc4f65bf3799edf'

* commit 'b2d415693482f58e104a99376cc4f65bf3799edf':
  Fix build.