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

Change-Id: I3ce4f128b933751b0ac76eac0f543295bba3e028