Merge "Fix BandwidthTest to report correct stats." into klp-dev