am b42c3a58: Fix the build

Merge commit 'b42c3a5809b16527b38c82be3165128ce10e77e6'

* commit 'b42c3a5809b16527b38c82be3165128ce10e77e6':
  Fix the build