Update from https://crrev.com/307758

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