Merge "Fix issue #38244875: Bring back testChargingConstraintFails" into oc-dev