am 9382e6c0: am f6224587: Merge "Improve adb tracing."

* commit '9382e6c07158f47315d5d5302300459b090c325f':
  Improve adb tracing.