Track upstream changes.

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