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

Change-Id: I8547f2f6f7caed16887558416525fb7d40cda46a