Merge "Fixes out of range bug in SimpleConditionTracker."