Merge "Add jarjar rules for service-nearby." into tm-dev