Bring in r199804 and r206397 from base to avoid killing in high-pressure swapping environments.