Merge "Fix raw ProtocolService references"