Merge "Fixes 5446301" into ics-mr0