* Roll engine dependency forward

* Tests seem to fail with segfault. Trying different engine version to troubleshoot

* Tests seem to fail with segfault. Trying original engine version to troubleshoot

* Tests seem to pass with original engine version. Continue bisecting.

* Tests seem to fail now. Continue bisecting.

* Reverted culprit cl, rolling to that