R=bmeurer@chromium.org

Change-Id: I06b889333fe6481d4704138031ce6de0fcf70a4c
Reviewed-on: https://chromium-review.googlesource.com/1013715Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52645}