Merge " Update to fix for bug 5393156" into ics-mr1