Merge "Snap for 5798008 from ba6135bd80e9d7a8b655b432adc4eef1e8e29e21 to sdk-release" into sdk-release