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

Change-Id: Idcb2ec5e6a5bf76fc68326245b6a915ac0571324