Merge "API Feedback: rename AddServiceWithFlag with plurals"