Merge "Reset services after setting group permissions in tests"