Merge "Using same task fixes 5486287" into ics-mr1