Snap for 11944020 from 9c0a5ce2b5f66660b9c4b1ea50cff8caaf01e4c5 to 24Q3-release

Change-Id: I645de56e381730b018a7f5d4f86f761d4131ac25