Port c24220c0c1 TEST=cctest,unittests BUG= Review URL: https://codereview.chromium.org/850733004 Cr-Commit-Position: refs/heads/master@{#26045}
c24220c0c1