Merge "Snap for 11541002 from 60c069bf52015661a48c638bb51e4cd88dfe38ef to sdk-release" into sdk-release