Snap for 12573674 from 8978019c44c8e5e61d12d8520f772feb044e3531 to 25Q1-release

Change-Id: I8548e6a742c42500802cafb3e4c8cf6d670750fd