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

Change-Id: Ifdc14cf2a0801df79e1fcb07a361b28aad27b5dd