Merge "Revert "Set channel info only to avoid responder role breakage."" into nyc-dev
Wei Wang [Mon, 25 Apr 2016 19:59:01 +0000 (19:59 +0000)]

Trivial merge