Snap for 12337407 from cd18acbf0036a7c6a3443e7e58b5091cacf327cf to 25Q1-release

Change-Id: I8d8e479d49727ab80e1a6a2111a42d18314c1642