Snap for 11944020 from d37d4d8b7daeb5ebb6011a1fe4e15d192a0e8059 to 24Q3-release

Change-Id: Ic6f5f9867c23a223c4c0b91414fb9dd68ffbe5bc