Merge "Minor bug fix in stale flow statistics data cleanup"