Snap for 12543847 from f19dee187b5be79179ede39218c9f6c7628c7264 to 25Q1-release

Change-Id: I905e7d7bc24f31c409b7e87ef9fd227cda3d5706