Merge "Remove duplication of skip_tracker"