Update from https://crrev.com/306901

Includes changes for https://crrev.com/306768

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