BUG=chromium:815092

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