Merge "Improve adb tracing."