Merge "Fix inconsistent Manila service naming"