Snap for 12327203 from 40f66733e4011bfc6a3317c01636a94fe6c45d3e to 24Q4-release

Change-Id: Idbef9678dd4fae4bd81d74fd164ec3cb2e8f0969