Snap for 11967491 from 4c443f84b986d97fb892c46f0e774ac06328ec12 to 24Q3-release

Change-Id: Ic63c8cc2e4048b5abc2fece118269635acab3b7f