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

Change-Id: I086be2886e1cdf48cb8d2d2302d97a9ee956eda8