am d0d23f6a: Merge "Disable time consuming debugging code." into klp-dev

* commit 'd0d23f6ae1e289ec781078e7c4d9d733893a5540':
  Disable time consuming debugging code.