BUG=angle:549

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