Merge "Snap for 5934975 from 1ab2344f6dd1b913c9e20c4afaba96105b00074c to sdk-release" into sdk-release