am 823ce529: Merge "fix build" into klp-modular-dev

* commit '823ce5298fec4d0d9f5773ce16af882e633f1f16':
  fix build