Merge "Fix NPE at startup" into ics-mr1