R=verwaest@chromium.org

Change-Id: Ib16b5bc8fe6790d3bb8a264fb2ecee0463645fa4
Reviewed-on: https://chromium-review.googlesource.com/728061Reviewed-by: Toon Verwaest <verwaest@chromium.org>
Commit-Queue: Michael Starzinger <mstarzinger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48773}