Merge "SDP: add return after SDP disconnection" into oc-dev am: 765abc5c am: 1f3bc321 am: 52cd67a7 Change-Id: I8aefeefb2a55d3548d47b10dab533bc7bff704f9