Merge "Snap for 11566117 from 669cddec82531fab05c06924dd67912db043d386 to sdk-release" into sdk-release