Merge "Snap for 5798008 from 9359ffb16b2b8d573dd27930a000190c49cb374d to sdk-release" into sdk-release