Snap for 12838584 from 987e85a3529fe6be878ce391e5708f465e86451f to 25Q2-release

Change-Id: Ie60882f471671bc047b57d5d5c0c94c0ed8fc56e