Snap for 11227258 from b11a0f5ce40b91c24046863e7e6fb56d17799994 to 24Q2-release

Change-Id: Iff8507a4587400dcdbd8e52b2a3bc69f9aa243b3