Snap for 13046591 from d5cd241818a243df6e75a38824a427398913129f to 25Q2-release

Change-Id: I7d9e9c2bdcacb61e8176764f45a7b071c5e4f139