BUG=angleproject:1017
BUG=angleproject:1097
BUG=angleproject:1323

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