Snap for 12205827 from 0ec8d00055c071142ef83704c074bf4061a1152f to 24Q4-release

Change-Id: Iebe07d4c013c307acb6f781ca81bff3ad65b5716