Misc. fixes and formatting clean-up Upstream-commit: 513f5a358adc9de5ecbca04b6d2225be84837580 Component: engine