am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev

* commit 'b659b4c7e1405056d189b44bd96036b6500dd378':
  DO NOT MERGE fix build