Sync API changes from 1.25 -> 1.24 Upstream-commit: d25cc581f7783a1664394df2506e246c99920ce8 Component: engine