Snap for 12224018 from aad52107db606244071baadee82e7bd3fed0ab82 to 24Q4-release

Change-Id: If72f8d1f375dbda9ce1017f6b601602422c18272