Merge "Fix UnfoldLatencyTrackerTest"