BUG=angleproject:1487
BUG=angleproject:1442

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