Merge "Autogenerate connectivity jarjar rules" into tm-dev