am dac56db6: Merge "Fix the build." into klp-dev

* commit 'dac56db680251dd9bd3913b6152d33457366c722':
  Fix the build.