Remove the redundant 'if' statements Upstream-commit: 884a1c2263dce2ec2c2992adfd0e80e8b2af52c9 Component: engine