Merge "Snap for 6290619 from 13d520b193266a610f5ca6b07b0c0f039ddb21b5 to sdk-release" into sdk-release