BUG=angleproject:1523
BUG=779346

Change-Id: I019597bea3f17f178d584b8a6f070d0640511781
Reviewed-on: https://chromium-review.googlesource.com/743852Reviewed-by: Geoff Lang <geofflang@chromium.org>