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

Change-Id: Ic53518b0e62803bb68b60ed318d6a0825b192164