Snap for 12594757 from e416139f13a72ab15bbe41bc1fe03a6dafca07c2 to 25Q1-release

Change-Id: Ibd197e06cad164d4d880643ca6ec9c63003b4056