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