am af0baad7: Merge "adb shouldn\'t trace unless told to"

* commit 'af0baad7a6407cf098aa64272e1321f7a495874a':
  adb shouldn't trace unless told to