am d8d85880: Merge "Fix build" into klp-dev

* commit 'd8d85880bba147a0a40bb199b0597241c3ef5f29':
  Fix build