Merge "Modify the interface of TransportMediatorJellybeanMR2 to fix build issues"