Merge "Reland "Check transport before registering."" am: e5f126ba18 am: 6e768c44f8
am: 368eb5c0bd

Change-Id: I9211b184f422a8483071cde03494f2118dfa2cbe