Merge "Build framework-connectivity using module_current"