am c926de31: Fix broken build.

Merge commit 'c926de31bcc8de204670d06ed3fb0d129d94d24f'

* commit 'c926de31bcc8de204670d06ed3fb0d129d94d24f':
  Fix broken build.