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

Change-Id: I14906c88908eeb6a7aa9527d1e523d52f1d52351