Merge "Revert "Check transport before registering."" am: 809efd8763 am: 9e8db15403 am: 498d72be9d am: 4df245a2a9
am: 28160d2488

Change-Id: I4bacf867cb89f5ec106b62f4465d2b01aef8cf74