Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1