Bug: 
Change-Id: I78403ce3c36f3c8276358f0bafff88131b2c7c00
Reviewed-on: https://chromium-review.googlesource.com/707316Reviewed-by: Camillo Bruni <cbruni@chromium.org>
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48401}