GitLab

https://crrev.com/c/2337734 was landed without the promised fixups
because of user error. These are the fixes that were promised.

Bug: 1112998
Tbr: ellyjones@chromium.org
Change-Id: I3442658b2016e0b772a2201d1ded10c7da383a39
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339720Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795210}