Merge "Revert "Autogenerate connectivity jarjar rules"" into tm-dev