Track upstream changes.

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

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