BUG=angle:616

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