Snap for 12337246 from 73dba5698b7af2b1b6cf7992dfa46511bf0a080a to 24Q4-release

Change-Id: I37bc27510280dcc9bfc4e5c8add0bd0310bd50b5