Merge "adb: fix track-devices-l." am: 6bac7cd942
am: 8836527a1f

Change-Id: I77fee5daadfc3ac6a334f9d5ebcb2add1c79ea1b