Snap for 11869550 from af4cc87fc25e52a0eaf329160d1e99e33ca6714d to 24Q3-release

Change-Id: I206a792a23af27ab4fcbb16690b51c83057c40cd