Merge "Allow batteryChargeTimeToFullNowSeconds to be -1"