Update to latest revision.
Rebase patches.
Gardening: Adopt to https://codereview.chromium.org/581953002/