Merge "Revert "Check transport before registering.""
am: 809efd8763

Change-Id: I8a45be94a1e2ac2ecfe7d8f4f401bb4809adb6f9