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

* commit 'e6a01f37934340c9fce9dcd8ee98b02d9d635af6':
  Fix build.