Merge "attempt to fix bug 5313580" into ics-mr1