Google Play Services refac