Bug: chromium:850005, chromium:852085,
Change-Id: I777321306b1b68330e39e43aacc715478764649f
Reviewed-on: https://chromium-review.googlesource.com/1104470
Commit-Queue: Camillo Bruni <cbruni@chromium.org>
Reviewed-by: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54007}