R=sigurds@chromium.org

Change-Id: Ieb73e6b573f2721e62b1c2bc216c26f8b9d38837
Reviewed-on: https://chromium-review.googlesource.com/1065970Reviewed-by: Sigurd Schneider <sigurds@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53257}