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

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