Snap for 11944020 from 274952982bff8bb240dfb0bd61a0cefb283053bb to 24Q3-release

Change-Id: I621a950baa89499503d1146dbd3e82a5605cb84c