Merge "Add trace category for adb."