Snap for 11520864 from f507e4a7f716e98875283b88ef8a86c655810edc to 24Q2-release

Change-Id: Ie762dc9dde232a86d754ecffecce14d20d996bc7