Track upstream changes.

Effecting CL:https://codereview.chromium.org/24704002
Track upstream changes.

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