Track upstream changes.

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