R=clemensh@chromium.org

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