Making sure we're consistent across our project. Upstream-commit: d6cf41cbe62ffaf2ed5bedf107d8bc4f804d3658 Component: engine
Upstream-commit: 24ddfe3f25f99db5a23f62d411c949b2236288a1 Component: engine