BUG=angleproject:884
BUG=angleproject:967

Change-Id: I113757dd9e1fae8fe0241a7286be979a90891b53
Reviewed-on: https://chromium-review.googlesource.com/270275Reviewed-by: Brandon Jones <bajones@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/273135