Merge "Snap for 5735642 from c2eb64586d6dfc0f067ea66631b38d1922a106ed to sdk-release" into sdk-release