Snap for 13256841 from f7ab2616e2b6a981b3f171999f1bae14ebc09a5a to 25Q2-release

Change-Id: I85378347879120f2a1f6257aa2bdad3a0f4c87dc