Merge "adb: improve debug traces readability."