Merge "Add framework-connectivity.impl"