am 676adb58: am 62831a7b: Merge "Eliminate potential reentrance from...
am 676adb58: am 62831a7b: Merge "Eliminate potential reentrance from unregisterInputChannel." into jb-mr1-dev
* commit '676adb58':
Eliminate potential reentrance from unregisterInputChannel.