R=jgruber@chromium.org

Change-Id: I9925ded8cee5c620f543171b2f93abb1f954e72e
Reviewed-on: https://chromium-review.googlesource.com/1078438Reviewed-by: Jakob Gruber <jgruber@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53435}