Snap for 12664851 from 7b5267099855d320f6013d667d113e3619f18bf5 to 25Q1-release

Change-Id: I8517ec68c3136554dcd3b2a407c16fdc7332f83d