Merge "Fix crash at boot."