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

Change-Id: Id62418797862818425d63641190f0fd656420187