Merge "Snap for 7800789 from db31e911986c1e6d419d117a2b9e6c2133901c6d to sdk-release" into sdk-release