Snap for 11648291 from a516b2b5e5d8fab7293414eb8c02ec9c24c27c57 to 24Q3-release

Change-Id: I89c4659c90fdb375b1d3b5e72e1334104e0c2f72