Merge "Fix concurrent modification exception in KeepaliveTracker"