Revert "Add getTransportFromManifest" am: ec0e39dffe am: d1abb21771
am: 37e7ff7251

Change-Id: I1278bc09529f08fa3b81ac5cf887223a9125a820