am f6224587: Merge "Improve adb tracing."

* commit 'f6224587e5fdb8d659172ba5a87a55685a94adf7':
  Improve adb tracing.