R=enne@chromium.org

Bug: 1024966
Change-Id: Ie6e4e3956a85e2acdf0be7efcbd47a4e9e000a9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1931200
Commit-Queue: Daniel Murphy <dmurph@chromium.org>
Reviewed-by: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718279}