Merge "Updated all samples with group categories." into developers-dev