R=clemensh@chromium.org

Change-Id: Ib85efebbfc18861709186f5257b9f85f145bb6b4
Reviewed-on: https://chromium-review.googlesource.com/1097324
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Reviewed-by: Clemens Hammacher <clemensh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53704}