Merge "Removes direct use of LocalServices.getService"