Merge "Cherry-picking I25bf497e for MR1" into ics-mr1