BUG=angleproject:2341,angleproject:2382

Change-Id: I5bcc0938e2d86165022cc80afda6b11c801ef5ed
Reviewed-on: https://chromium-review.googlesource.com/944711Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>