Merge "Add measurements for TransportClient connections" into pi-dev