am 1cf2b91f: Merge "Fixing build break" into klp-dev

* commit '1cf2b91fe533d9e50bce6e5551ae26bccdb4a965':
  Fixing build break