Snap for 12243189 from a05d319e9b707ba7c2bd1f9baaf7d3117d3200aa to 24Q4-release

Change-Id: I2a81dcfed1b0f317aac23220880c3026c7250783