Merge "vndservicemanager requires vndservice"