Snap for 11996894 from 6e66074dd36c6f3a22d999e9abf6b3c5c2d5f4f0 to 24Q4-release

Change-Id: Ia664e4583c5ed71cb7fa91508f63309b1048500f