BUG=angleproject:879
BUG=angleproject:1038

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