am 0ec4b936: am 439cdfd0: am af0baad7: Merge "adb shouldn\'t trace unless told to"

* commit '0ec4b9363a0298b2da532d3591f4ae99b04d88db':
  adb shouldn't trace unless told to