Snap for 13046591 from c31fcae72949ef17ea10fab3a6a9baeb242fc5af to 25Q2-release

Change-Id: Ic655c01874b13b0c9a9bb353da6773d999d3f73b