BUG=angle:490

Change-Id: I5a685e42089377b5c600cd1f7ca8bd9a6654b3ba
Reviewed-on: https://chromium-review.googlesource.com/204939Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>