Merge "Fixing unit issue in dis/charge time remaining parameter."