Snap for 12687986 from 163248a8a183bd95a021326269e50f77cd500db5 to 25Q1-release

Change-Id: I26a12c8b8a6382dee825108116fce8e335abe11e