Merge "Snap for 11455877 from 0764dad6b4c424ec9bd5dfee19d66ed7c786456f to 24D1-release" into 24D1-release