Merge "Snap for 5475808 from b15c1374666554f5db51cac2938ce68189e3906e to sdk-release" into sdk-release