Merge "Fix a bug in test that cause the flakyness in SimpleConditionTracker_test."