Snap for 12667701 from c3bb750ec7eb922e09fa5e458ce0060fe3672658 to 25Q1-release

Change-Id: I4efc50e41960266105dbb9982db14dda34af7bff