am b65fd472: am b6264a87: Fix the build.

Merge commit 'b65fd4726ce625958876ee0b68c622839f33a64c'

* commit 'b65fd4726ce625958876ee0b68c622839f33a64c':
  Fix the build.