Merge "adb: fix adb trace tag" am: 94dd4b7410 am: bc4d167a2d
am: 2b6b87c4d8

Change-Id: Ifb394f1b3b4e7e0b33a6f478bdc7fd89c751f4a9