BUG=angleproject:1149
BUG=angleproject:880

Change-Id: I2840043ded50f805afa3032fc1f0362fa91b8877
Reviewed-on: https://chromium-review.googlesource.com/297088
Tryjob-Request: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>