Depends on: https://crrev.com/c/924114

Bug: chromium:756691
Change-Id: I4fb6dcbdf0d5e134ef3756b231d8f98d9d41b403
Reviewed-on: https://chromium-review.googlesource.com/924617Reviewed-by: Frank Barchard <fbarchard@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>