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

Change-Id: Idfe153b3b7213aaaf438d4bfd34030bb362a316a