BUG=angle:331

Change-Id: Idb3c3ddc6ddd6bfc21b15b7e8942975ce4cd051f
Reviewed-on: https://chromium-review.googlesource.com/200811Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Nicolas Capens <nicolascapens@chromium.org>