BUG=angle:529

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