Snap for 11526283 from c093a5679781ffd71c82b30833ec18c3980d7719 to 24Q2-release

Change-Id: Ibc2eae9f9b85b27acd7369f5be9179b5d1312ca6