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

Change-Id: I6087697ebee9732a42d5598a828636b2044b5fe6