Merge "Snap for 7110675 from 294b61b1ab3adc67024dfa2226df0cab9fe68df2 to sdk-release" into sdk-release