getTransport respects system/manifest.xml am: 64a41d5877 am: dfdf0a76b8
am: a4547bdb4b

Change-Id: I3660f9ec960d776033c7ee7abd2e349691984b90