BUG=angleproject:1418
BUG=angleproject:1340

Change-Id: I8930845a2d398440a78b2569daaf655b51a30ee9
Reviewed-on: https://chromium-review.googlesource.com/354261Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>