Merge "Fix a typo in service class"