Merge changes from topic 'adb_trace' am: 8e7c782eaa am: 2f78a3f6a5 am: 802798556c
am: f59e3375d3

Change-Id: Iac75ff72337e4556b97a20662166d242c0e37cb3