Patch from Thomas Köppe <tkoeppe@google.com>.

Change-Id: I7ae2e001b6bd72ad67baad64d35e7c17d4ed4716
Reviewed-on: https://chromium-review.googlesource.com/806221Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49838}