Merge "Clean up a couple of bugs about transport init staging" into nyc-dev
am: 09d83b0

* commit '09d83b032e5f456750f2f3149aa4932836643957':
  Clean up a couple of bugs about transport init staging

Change-Id: I0c32b31bf82b1d3ed798263816ca789c3a7305d8