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

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

Change-Id: I247067afde6cf7b738d9e6ff060f08729b35420c