Merge "Remove mso-nssmf-adapter from SO Issue-ID: SO-3535"