Fix some random reboots

Change-Id: I2a28f2f87fdd1a49083c263fd20f9755683dc2a3