Merge "getTransport checks interface and instance names." am: 7f0300f1e2
am: 7719c1ad0d

Change-Id: I8fcb35bdd7325e9bcae169f03142499b2490dd19