BUG=angleproject:1553
BUG=chromium:630498

Change-Id: I4c341e57f2e0439ffd7bdcf74e15ca0de4152c5d
Reviewed-on: https://chromium-review.googlesource.com/435106
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>