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