Snap for 12524026 from 3e7d4dfb4767a54b6b9eb1a3acdf38370379b6ad to 25Q1-release

Change-Id: I64ca92149994332e869e2f7579e0478578e5fb85