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

TBR=yangguo@chromium.org

Bug: chromium:756691
Change-Id: Ibbc3bd35e8727296c1539edc961e3184830575ff
Reviewed-on: https://chromium-review.googlesource.com/924609Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#51341}