Merge "relocate GoogleLoginService"