Merge "Add modules-utils-os to service-connectivity"