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