BUG=angle:581

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