BUG=angle:566

Change-Id: I437bdec916dbfe12cb310a20d4f38c18072eacd0
Reviewed-on: https://chromium-review.googlesource.com/187210Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Shannon Woods <shannonwoods@chromium.org>
(cherry picked from commit aacedfcf)
Reviewed-on: https://chromium-review.googlesource.com/187201Reviewed-by: Shannon Woods <shannonwoods@chromium.org>