Merge "Snap for 5590969 from df3497b295448ffd4ad4d066b8a89fca0376a940 to sdk-release" into sdk-release