Update from https://crrev.com/304418

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