Re-roll for 8.6.x branch.