patches: Track CL 32423009 from upstream

https://codereview.chromium.org/32423009