BUG=angle:685

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