Merge "Remove framework-connectivity-annotations library" into sc-dev