Fixed by using correct info from the corresponding transport Test: Unit tests + manual Bug: 126436426 Merged-In: Ie8ae20423b794622b6a6141faf68c01b75c144ce Change-Id: Ie8ae20423b794622b6a6141faf68c01b75c144ce (cherry picked from commit 1fa6cf157806673ca65383d281ca344329e28c28)