Merge "Fix issue #38244875: Bring back testChargingConstraintFails" into oc-dev am: 2c5f9107f7
am: 61986c9e4c

Change-Id: I93be5d38ebcd4bcc74f06954f76f32bf8b4a1425