BUG=angle:772
BUG=395405

Change-Id: If26a0ec34e6bfd0e22d20803a0bb3ac2000a8e34
Reviewed-on: https://chromium-review.googlesource.com/225531Reviewed-by: Cooper Partin <coopp@microsoft.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Geoff Lang <geofflang@chromium.org>