R=clemensh@chromium.org
BUG=chromium:801878

Change-Id: I32a3cf3a63dfe073a06066f1db2fb32eb739f153
Reviewed-on: https://chromium-review.googlesource.com/883367Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50836}