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

Change-Id: Idb282b37d1c5aee6124259c2e63218fc1f4702f2