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

Change-Id: Idf66686303f47dcac0d7361953aee1e57ecb9ecf