BUG=angle:611

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