Re-rolling for 8.6.x branch.