Merge "Fix an NPE on ICS factory rom."