Merge "Fix crash on boot" into cm-11.0