R=mstarzinger@chromium.org

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