BUG=angle:552

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