Merge "Remove unused empty filegroups from connectivityT package."