Snap for 12710726 from f49abf12f6469e48978e63cca18acf62231f9a25 to 25Q1-release

Change-Id: I91a8bbd0f5c504b1a92e9cfb747a0684f4e2e164