Merge "Use framework-connectivity-t instead"