BUG=angleproject:2668
BUG=angleproject:2714

Change-Id: I9f375caa605e13aae04e8051a779515f8ddfb93a
Reviewed-on: https://chromium-review.googlesource.com/1155105
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>