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

* commit '1e1ca756a9db35792df880b39300fcfd07e6f707':
  fix build