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

* commit '5e49328df75fa132f3a1481e1bacc0550712bb78':
  Improve adb tracing.