Merge "Merge SampleSidecarImpl and StubSidecar." into main