Merge "Fix NPE" into ics-mr0