Snap for 12319997 from f9628017375714eb73a0d3c7d41fba216244eda1 to 24Q4-release

Change-Id: I2ee2297142de15aa2b85c7485fec4c2a84d0894d