Merge "Fix local service binding in tests."