Snap for 12445464 from 8b4761095d2660850aa4e58620bd9e17c036369a to 25Q1-release

Change-Id: I92fc1bb849f7d9d6143a4641cd0c481062fd6204