Merge "Check transport before registering." am: 6077c7aecd
am: 7d1d1d836a

Change-Id: I9d6be8d6cd4d7d88733ac3fcbdf4f55785906114