* Revert "Revert "Roll engine to 7d17da76d (#19785)" (#19792)" This reverts commit e1a3e1bfd8.
e1a3e1bfd8