BUG=angle:640

Change-Id: I5fe568c9a2b492a5bd8a42142762229c5f992c7e
Reviewed-on: https://chromium-review.googlesource.com/198248Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>