am d15002a6: Merge "Fix build." into klp-dev

* commit 'd15002a607de29c0a42dca1afee1183132c664a4':
  Fix build.