Port 6950ead0

This commit fixes the remaining test failures after: ec52f8df

BUG=

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

Cr-Commit-Position: refs/heads/master@{#26118}