Merge "adb: fix track-devices-l."