Merge "Snap for 11541002 from 213615c8ed5fea5989ce00b1ef043ac946cae744 to sdk-release" into sdk-release