Snap for 12765415 from be62c453c59cdb8145a6c09dcc6f095111bc5e1a to 25Q1-release

Change-Id: Ia6407fd452a9783d986600bd78acdf03b7c998e9