Merge changes from topics 'adb_thread', 'adb_loopback' am: 0301b3217b am: 750dfee974
am: da1f886ed8

Change-Id: I0a20514a043312c069e81166cd7b980ce3e54490