Snap for 11486189 from 80b054d58aa89d459c0e91fe35dc8a8c8627fa2a to 24Q3-release

Change-Id: Ibe5c77d20e626509f0dda22fef55cf8bc30b8d40