Cherry pick underflow fix.

      BUG=583607

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

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