BUG=chromium:815092

Change-Id: Ide35e070c01e910545a6d04bd45382d91dbb45e5
Reviewed-on: https://chromium-review.googlesource.com/1008262Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52577}