Merge changes from topic 'adb_trace'
am: 8e7c782eaa

Change-Id: I1545be5ffc0dedbeadf9efc3f275262bd3e8bfbc