Merge "Remove redundant per-file *"