Snap for 12199973 from 3c1bdb635bb7dc9173791f3c26fd6765e97b18fe to 24Q4-release

Change-Id: Iec5ac2e7e40704f069d70686411ec0dfee1539ab