Merge "fixed sonar issues in NetworkAdaptorNotify_Service"