Merge "Revert "Adding client side logging for receivers.""