am 6866ecb9: am 1d62c773: Fix the build

Merge commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea'

* commit '6866ecb92700a03b4285cb8427eedf579f9cf0ea':
  Fix the build