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

Change-Id: If1c239993ab3a6f2522321ef9e17ec4588307f10