Merge "Snap for 7083521 from d48b2cfcd086f07f641e256bac75856c753d567b to sc-d1-release" into sc-d1-release