Merge changes from topics 'adb_thread', 'adb_loopback'
am: 3187510b17

Change-Id: I18578729590be59de526dbda364627b28503a092