Merge "Snap for 8253222 from 39837afad7ba9411445677497f8c60b01a0b4195 to sdk-release" into sdk-release