Merge "Snap for 11541002 from 8f7ffa3eb27884e4e511d6921b06eb7a41069d47 to sdk-release" into sdk-release