GitLab

Also fix a couple of miscounted constants

Bug: 1005220
Change-Id: I4eeebc048594030a1a7e86e730a2b01450c97f1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1810802Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Commit-Queue: Aaron Tagliaboschi <aarontag@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697623}