Merge "Synchronize on a static final object to lock mDeviceBusy" am: 34f9a3e9e9 am: 56d37b7c43
am: 9020cf9a48

Change-Id: Ia12ca64ff5acca55182bac2fb8bae2523c7fc06a