BUG=angleproject:1092
BUG=angleproject:1095
BUG=angleproject:1323

Change-Id: I58550f841febbfdf45133707f72e7f3a62b20a1c
Reviewed-on: https://chromium-review.googlesource.com/353343
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>