patches: Track Upstream changes

Effecting CL: https://chromiumcodereview.appspot.com/23615009
Track upstream changes

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

but also there's one minor change from CL:
https://codereview.chromium.org/24343002
Merge branch 'for-upstream'