Merge "Fix crash during boot."