Snap for 12770256 from 0d31668708a29807645dd9b037e92ca3088b57f1 to 25Q1-release

Change-Id: I3b7e6baa194b7c9327c7abed38cad4bdf3971313