Snap for 12327203 from 5bd5e9f53610d29a6f828296e5820b136ee4d524 to 24Q4-release

Change-Id: I156c14abffbbe326e3e1f79673f56b04d635d23e