Snap for 11959661 from b3c6e7e47a0f1ea2bc93179430b755da1c3d558d to 24Q3-release

Change-Id: Ia65026050f39878031fca1bc6532530e67073178