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

Change-Id: I0553a8c70ac8a04bd2a32138e2bdd5f63e894258