am c78e0b01: Fix the broken build

Merge commit 'c78e0b01e6c4da1d8fecd5b6017a76f159066ea1'

* commit 'c78e0b01e6c4da1d8fecd5b6017a76f159066ea1':
  Fix the broken build