Merge "SDP: add return after SDP disconnection" into oc-dev am: 765abc5c am: 1f3bc321 am: 52cd67a7 am: 6ef34869 am: 7b3e5973 Change-Id: If737087dc356efde7f2f7c3cc844cbbe7e948e2f