Attempt to fix deadlocks on deb

Change-Id: I4df580856f6fd9f8b52a7454f4eb2c6ea3cce55c