Fix random boot hangs

Change-Id: I3410431a64f2fbd76f7b4e2ba593efd53fa92150