BUG=angle:581

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