am cfba284a: am d73e66cc: Fix broken build

* commit 'cfba284ad72b6ac3d7189f7c87cddb7299da7617':
  Fix broken build