BUG=angleproject:1145
BUG=angleproject:879

Change-Id: I04eb900df28909f97469691a6c05a6af775d7465
Reviewed-on: https://chromium-review.googlesource.com/322693Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>