BUG=angle:495

Change-Id: Ib9c19130dfbc44a99998c5d6d8160bfc2b683eb9
Reviewed-on: https://chromium-review.googlesource.com/185037Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>