Snap for 14295020 from f89818d7cc10ee0a3323027f5167945e38508076 to 26Q2-release

Change-Id: I51abb7781c7a8fd9e751b2a02ac6f1fe09a10d35