patches: Track CL 47363002 from upstream

https://codereview.chromium.org/47363002