am 904aa38f: Merge "Try fixing the build again" into klp-dev

* commit '904aa38f1a420c42467a13b8d5108d1891350c97':
  Try fixing the build again