Merge "Snap for 11598262 from 561f6274907da3c8e28cec20df8dff73f3fc3d5d to sdk-release" into sdk-release