This roughly takes 40% less time.

Change-Id: I7886bd85cd33c9b2d2225e0f207a3e3bf89f1ef3
Reviewed-on: https://chromium-review.googlesource.com/c/1491511
Commit-Queue: Toon Verwaest <verwaest@chromium.org>
Reviewed-by: Leszek Swirski <leszeks@chromium.org>
Cr-Commit-Position: refs/heads/master@{#59898}