Snap for 12304452 from 1f7276273a45c68a1a403f7770d2b17d90c3afe6 to 24Q4-release

Change-Id: I9b6c4a81f6ce15d28cee2bd4a9f8384c8eb3453a