Bug: angleproject:2747
Bug: angleproject:2763

Change-Id: I19f9e5ba760d3b5baf3997284523ee1db6bb8166
Reviewed-on: https://chromium-review.googlesource.com/1172206Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jie A Chen <jie.a.chen@intel.com>