Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a

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