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