BUG=angle:581

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