Snap for 11981331 from b3c6e7e47a0f1ea2bc93179430b755da1c3d558d to 24Q4-release

Change-Id: Ic0833bf709a66f38ee534b7a9ac8b63947118efa