Snap for 12348750 from d9237f2d2293dd45828ef66c5cba899ae78eb76f to 24Q4-release

Change-Id: I0f6f18ba149496db6aefb9729fd93d1544794cd2