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

Change-Id: I004a5d6fd86c1d1774f9be6c837dac4b8a7d2373