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

Change-Id: I076919ca0e5a10a49b225ef27967730f5e9869db