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

* commit '1a529ddaa71a3dfa50586a145ebfa502bea85e1d':
  Disable time consuming debugging code.