am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams...
am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '5d42075e':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets