am 504b6045: am 4270ebc7: Merge "Remove debug logging." into klp-dev

* commit '504b60453f30b78da3a13e022a1d8a7badf26ae1':
  Remove debug logging.