Merge "Fix NPE when returned child is null." into ics-mr1