Merge "Support remote_collector in container"