Fix random boot hangs this time for real

Change-Id: Ia07c330ec39c1c14bf0af1be4b2eab947d86a5b6