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

Change-Id: Ie44e09d89745d2179514c3b9fb8ab80e544e3701