Change getTransportFromManifest to getTransport. am: 20273f9b30
am: 7a3c229ea4

Change-Id: I682d6568ae056e6b612ef37e2fead9d1586e14b8