Merge "Rename merged services.txt module"