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

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