R=ahaas@chromium.org

Change-Id: Id21608780e345448398ad4066ad307bef7358801
Reviewed-on: https://chromium-review.googlesource.com/849832Reviewed-by: Andreas Haas <ahaas@chromium.org>
Commit-Queue: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#50396}