Snap for 11465908 from cc02abaa54a91ae8941c737dbb8e384a0f9087e6 to 24Q2-release

Change-Id: I013e1fb04ab9cbbfafb3cf4293a0870b406030f0