Snap for 12558386 from fc6ac9d73d1430a42be42c99ced713c50729a82c to 25Q1-beta-release

Change-Id: Id3ffe3d2cc6c85fdd15b9b0e8ff1c4780957ecd7