Gardening: Update to latest commit.
Gardening: Rebase patches.
Gardening: Adopt to https://codereview.chromium.org/623293004
Gardening: Adopt to https://codereview.chromium.org/672823002/
Gardening: Adopt to https://codereview.chromium.org/626663002