patches: Track upstream r31243002 changes

Effecting CL: https://codereview.chromium.org/31243002