Decrement channel count even if channel close fails am: 45fc881717 am: 62cbfc299d am: 555cd2d05a

Change-Id: I856ec246305079ca48440cfaa3df965f27f039be