Snap for 12319997 from 541f233c8b23e3858be0cd75b2384b5286feb84a to 24Q4-release

Change-Id: I703edc0ba2a2d9f6b4ee5d17ba0ee418b9773044