Merge "Snap for 8952093 from 841d5199e1d1c64e7853fd953eed5247780908c1 to sdk-release" into sdk-release