am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev

* commit '62831a7bd02868316ad1a16dcf13c98896fdbbdc':
  Eliminate potential reentrance from unregisterInputChannel.