BUG=angle:581

Change-Id: I50a1181d0547c5629c9037f6d8e989c505c7e5ed
Reviewed-on: https://chromium-review.googlesource.com/198239Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>