BUG=angleproject:1435
BUG=angleproject:1436

Change-Id: Idd11e29ad49cb488d3a8ecefd6aefc181b43d3fc
Reviewed-on: https://chromium-review.googlesource.com/361558Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>