Merge "Snap for 11785460 from 2fc8ec8c8e6414a9c3128a6ce9b251ede892d477 to sdk-release" into sdk-release