Merge "Remove unnecessary local service after test"