Snap for 11828632 from 01cff54ba42e2c715df479792db99f202be6e8cc to 24Q3-release

Change-Id: I6e073ad571da71075fb991a6496411ffe0bc4e35