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

Change-Id: Ice7823509fd40b75bb80a45ccfc9eb1f1e94dea6