Change getTransportFromManifest to getTransport.
am: 20273f9b30

Change-Id: I980328cdb7790986787f3f096af1890cf1cda4ab