[automerger skipped] Merge "Moved transport manager to the correct directory"...
[automerger skipped] Merge "Moved transport manager to the correct directory" am: 80d2e4ba am: 231eac2b
am: 77066e96 -s ours
am skip reason: change_id I893ae4ec2e8345d857c007891b2ff9e5ed25f3cd with SHA1 24bc6857 is in history
Change-Id: Ifa52b53c7b1e909460b8e58709b06ac9d17d9130