Merge "Add getTransportFromManifest"
am: 8ffa58d176

Change-Id: Id22622dc8f1cfa96b3f8f434fc1cbb3cf5dce242