am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-dev

* commit 'c28716964c4525bf9a291404d7f14e74de23f36f':
  Fix build.