Snap for 12537680 from 83fd5c18a98d24f1aff47c00683ca6380590a84a to 25Q1-release

Change-Id: I12f2e57c65171c6eb244cd733b5bab0958af301d