Merge "Add null check" into ics-mr0