BUG=angleproject:882
BUG=angleproject:1149

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