Decrement channel count even if channel close fails am: 45fc881717

Change-Id: I3110b44da78f9bbf227fafde48a7fb84c1474865