Snap for 12229688 from 35c947f68dfbad2f87b0c155108f24729a90e38a to 24Q4-release

Change-Id: Ic908f745bc8eb0721a51b08dcb4b1e8aa1ef3052