Snap for 12525496 from a0fda659f017a559156848871b6c600de4b257d7 to 25Q1-release

Change-Id: I904b2b26d7b3a11f525ed990e68f76c928e9dda7