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

Change-Id: Id54c7a1196d0f2a7cc88cfed0d17d57c978552d9