Snap for 12439515 from 31acb08b44444f308a634f1910322692acc09676 to 25Q1-release

Change-Id: I7b500cad9e55c20a7a3efdd2e3f6c7c5964adc65