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

Change-Id: I9732c77296edf0555083df146b0eb2d43ac66410