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

Change-Id: I0c5a506835037ebed5904785bd30f517e7b9c22e