Merge "Add getCurrentTransportComponent() API"