Merge "Fix to the boot loop on AAE platforms."