GitLab

The Optional<> rewrite reversed the sign on extra margin space.

Also updated test expectations. Down to 165 failed from 207

BUG=635619

Review-Url: https://codereview.chromium.org/2623103002
Cr-Commit-Position: refs/heads/master@{#443419}