Merge "Fix a bug in SimpleConditionTracker."