Merge "Snap for 4953200 from afbad758fae6b74b4a739935341c224575c58169 to sdk-release" into sdk-release