Merge "Add service-nearby jarjar rules"