Snap for 12397640 from bd3a87122c0b0021ee7f7e98e34bd46bc777fbfa to 24Q4-release

Change-Id: Id781ba803336797847049f0ff76ad8bb9be4143b