Includes potential bug fixes.

Bug: angleproject:2691
Change-Id: I9a22dbdc96045df36de086f7edf7c914bae1cdbf
Reviewed-on: https://chromium-review.googlesource.com/1117320
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Luc Ferron <lucferron@chromium.org>
Reviewed-by: Tobin Ehlis <tobine@google.com>