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

Change-Id: I081c4d90d884a6e90dc19aaab1a95c42fd3ca733