Merge "Snap for 6348162 from 624a8528a824b0ddb55b368bd4884aedc1caa5cb to sdk-release" into sdk-release