Merge "Add ::1 to localhost in etc/hosts"