Main author: Vladimir Vukicevic
Original review: https://chromium-review.googlesource.com/#/c/185693/5

BUG=angle:551

Change-Id: I272ee33b315c4a33ff81c1c63c356347da42e545
Reviewed-on: https://chromium-review.googlesource.com/194982Tested-by: Nicolas Capens <nicolascapens@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>