Fix google plays services, refactor for google sign up logic.