Fix random warm reboots

Change-Id: I46b81d1ee51bfa3d422790d351247b29441191dc