Snap for 11510485 from 5d30a380d378d3941810f0ef8ffa67a12db5f2ac to 24Q2-release

Change-Id: Id55515f75d6a82700866bc77672b11f6fc2c7155