Snap for 11648291 from a13b111b07ab7283b954dec4feea7c50c51930a7 to 24Q3-release

Change-Id: I091291d3ead9796dbfcb155092001cd5cc9a8fa6