Merge "Snap for 5590969 from b5a03fec13adc648cf57ce38eb943106a2763278 to sdk-release" into sdk-release