Merge "Snap for 11541002 from 170c2c775195c94604287a60731d6d0fa1d6e3cf to sdk-release" into sdk-release