am 0a82531c: Merge "Fix build." into klp-dev

* commit '0a82531c1bcfef90e6f558b536e1e0fad5581ed4':
  Fix build.