Merge "Add dependency on framework-connectivity" into sc-dev