Prepares for: https://crrev.com/c/1015000

NOTRY=true

Bug: chromium:830557
Change-Id: I51c12867d95de19350e0e55aaf097bbb479348dc
Reviewed-on: https://chromium-review.googlesource.com/1015004
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#52657}