Snap for 11881322 from f88315fad0270be5ee4c6c0eb3a8e01cbfe08e92 to 24Q3-release

Change-Id: Ia7111b792188bcb9ebdfecfcac3729ee4b2381d3