Merge "LocateServiceImpl.java-remove unused import"