Merge \\"RTSPSource: relax error condition.\\" into nyc-mr1-dev am: 3765d3a2b5
am: 400eb12253

Change-Id: I5b43ff71fb6215b0540554122554704f2f85a6e9