Merge "Add NetworkFactory to connectivity jarjar rules" into sc-dev