Merge "API: Supress existing inconsistent Context service names"