GitLab

Bits of code have snuck into the local branch without making it
upstream. Add all of those bits here.

Bug: None
Test: Cast CQ
Change-Id: I6e042ae5dd83653e3f3656fcc9559e7b71a77c9c
Reviewed-on: https://chromium-review.googlesource.com/c/1300613Reviewed-by: Luke Halliwell <halliwell@chromium.org>
Reviewed-by: Simeon Anfinrud <sanfin@chromium.org>
Reviewed-by: Yuchen Liu <yucliu@chromium.org>
Reviewed-by: Sergey Volk <servolk@chromium.org>
Commit-Queue: Luke Halliwell <halliwell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#603192}