Snap for 12337407 from ad5d4ab7685ae74af7ad0f24942e688a06bf2305 to 25Q1-release

Change-Id: I8254029dfe5c270ce7ad3e57bc52c9f13c996994