Merge "Revert "Change messaging clients to return one value and update tests""