R=bmeurer@chromium.org

Change-Id: I99013e446635aa4555cf03ebb201a65434542f35
Reviewed-on: https://chromium-review.googlesource.com/918661Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51287}