Merge "Snap for 5590969 from 6c0b6176cdf020461e9af114fd943b57563b2110 to sdk-release" into sdk-release