Merge "adb: Avoid extra string construction"