am 380cd96e: Fix the build

Merge commit '380cd96e5d7018cbf43295c9f2f2a33897affd63'

* commit '380cd96e5d7018cbf43295c9f2f2a33897affd63':
  Fix the build