GitLab

Merge internal change: 195841296
Merge internal change: 195910638

R=rch@chromium.org

Change-Id: Id9681a3360ced19d329b68e161ff897e17ef43e7
Reviewed-on: https://chromium-review.googlesource.com/1055756Reviewed-by: Ryan Hamilton <rch@chromium.org>
Commit-Queue: Victor Vasiliev <vasilvv@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558371}