Snap for 12337246 from 4681ea5db89209f545d0ad69e26159673aa4a2bd to 24Q4-release

Change-Id: Id0839e182c91d83b417660345675de5827e32880