Merge "revert the stripping of System Group: from the names of google system groups" into froyo