Merge "Snap for 11349503 from c166acd5b2487a6be17d9e92b27ab35d780cd6b5 to sdk-release" into sdk-release