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

Change-Id: I5280a18f0f93396e02df236fb3f78fa952cbc460