Merge "Change telemetry client to return one value and update tests"