Merge "fix bug 5911175" into ics-mr1