Merge "Snap for 5303890 from 849299cdc876caea9cee8d15483efd3e46a2c83c to sdk-release" into sdk-release