Merge "Update S3Ps to use Kafka"