Bug: angleproject:2306

Change-Id: Ic63de75d12b76395450517c99b742b8a5807cf9b
Reviewed-on: https://chromium-review.googlesource.com/1179373Reviewed-by: Lingfeng Yang <lfy@google.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jie A Chen <jie.a.chen@intel.com>