Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1