Add getTransportFromManifest am: fba2495bc6 am: f8b66c8137
am: 4cc3af49aa

Change-Id: I3a34a54eee0ca099e59f66c3c61b67fb22aae70c