Revert "Make unique_id required in service related messages"

This reverts commit d446a074364d1ad6baa14a7c096f7caf17027783.