Snap for 11869550 from 26e8daaaf279e05da2c077d7009f64c1747a0ed5 to 24Q3-release

Change-Id: I4892b82f69658755abf189fc83bd322fbb04bb21