Merge "adb shouldn't trace unless told to"