Merge "Add Metering Labels client unit tests"