am db037bcd: Merge "Make atransport be a real class."

* commit 'db037bcd221c6116434f6ae555e65e6e1db77ff7':
  Make atransport be a real class.