Merge "Snap for 4953200 from 68d29651a7b1b7b81822d035d222202adcf5de5d to sdk-release" into sdk-release