Update from https://crrev.com/302630

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