Merge "Various fixes to improve resilience of the rtsp stack against spurious errors instead of asserting." into gingerbread