As a simple and backmergeable fix for crbug.com/774459.

Bug: chromium:774459
Tbr: bmeurer@chromium.org
Change-Id: Ibe55ad13fe6be63a76dc3079a0288356ce35de9f
Reviewed-on: https://chromium-review.googlesource.com/719461
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Reviewed-by: Adam Klein <adamk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48561}