getTransport respects system/manifest.xml
am: 64a41d5877

Change-Id: I404ca71b2adb65349ae428f518a0b17eb4f26f5b