Merge "Rename "service-nearby" to "service-nearby-pre-jarjar""