am b8160401: Merge "Fix the build" into klp-dev

* commit 'b8160401a6ebfb6287513400ff9834656e5cb6e7':
  Fix the build