See https://codereview.chromium.org/2808833003/
for context.

Bug: 699120, 693058
Change-Id: I1420c347d4ae2bac8bea54bc1b921fe6b65e6161
Reviewed-on: https://chromium-review.googlesource.com/474027Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>