Merge "DO NOT MERGE cherry picking from MR0 cl 148223" into ics-mr0