Merge "Revert "Set channel info only to avoid responder role breakage."" into nyc-dev
Wei Wang [Mon, 25 Apr 2016 20:14:22 +0000 (20:14 +0000)]
am: 931b5c3

* commit '931b5c3490fadeaee335d8063d87b76167bb4af9':
  Revert "Set channel info only to avoid responder role breakage."

Change-Id: I022ebdc14a35998b753700433f8c4189c23afc36


Trivial merge