Update from https://crrev.com/309415

Review URL: https://codereview.chromium.org/822713002