Merge "Remove nodeport for aaf-sms"