Snap for 11533280 from be6f898b8d3b5fa1e506250fce7578bd8f5a6a5b to 24Q3-release

Change-Id: I811fc3ca64ee8dea9065d07bb34bede4ab0db6c6