Merge "Add dependency on framework-connectivity"