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

Change-Id: I9b811571c301f034c06cdbad5c90afe746023173