Merge changes from topic 'adb_thread_safety' am: 9083ff1c24
am: 2ca23fa508

Change-Id: I1dc6a811c2e528cdb727cfb26cd0b309e34e7e74