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