diff --git a/play-services-api/src/main/aidl/com/google/android/gms/ads/identifier/internal/IAdvertisingIdService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/ads/identifier/internal/IAdvertisingIdService.aidl
new file mode 100644
index 00000000..5f4f5c1f
--- /dev/null
+++ b/play-services-api/src/main/aidl/com/google/android/gms/ads/identifier/internal/IAdvertisingIdService.aidl
@@ -0,0 +1,8 @@
+package com.google.android.gms.ads.identifier.internal;
+
+interface IAdvertisingIdService {
+    String getAdvertisingId() = 0;
+    boolean isAdTrackingLimited(boolean defaultHint) = 1;
+    String generateAdvertisingId(String packageName) = 2;
+    void setAdTrackingLimited(String packageName, boolean limited) = 3;
+}
diff --git a/play-services-api/src/main/java/org/microg/gms/common/Services.java b/play-services-api/src/main/java/org/microg/gms/common/Services.java
index 7173d02c..56a5c93e 100644
--- a/play-services-api/src/main/java/org/microg/gms/common/Services.java
+++ b/play-services-api/src/main/java/org/microg/gms/common/Services.java
@@ -19,325 +19,335 @@ package org.microg.gms.common;
 import java.lang.reflect.Field;
 
 public final class Services {
-    public static final class GAMES {
-        public static final int SERVICE_ID = 1;
-        public static final String ACTION = "com.google.android.gms.games.service.START";
+
+    private Services() {
     }
 
-    public static final class PLUS {
-        public static final int SERVICE_ID = 2;
-        public static final String ACTION = "com.google.android.gms.plus.service.START";
-        public static final String ACTION_INTERNAL = "com.google.android.gms.plus.service.internal.START";
+    public interface GAMES {
+        int SERVICE_ID = 1;
+        String ACTION = "com.google.android.gms.games.service.START";
     }
 
-    public static final class PANORAMA {
-        public static final int SERVICE_ID = 3;
-        public static final String ACTION = "com.google.android.gms.panorama.service.START";
+    public interface PLUS {
+        int SERVICE_ID = 2;
+        String ACTION = "com.google.android.gms.plus.service.START";
+        String ACTION_INTERNAL = "com.google.android.gms.plus.service.internal.START";
     }
 
-    public static final class WALLET {
-        public static final int SERVICE_ID = 4;
-        public static final String ACTION = "com.google.android.gms.wallet.service.BIND";
+    public interface PANORAMA {
+        int SERVICE_ID = 3;
+        String ACTION = "com.google.android.gms.panorama.service.START";
     }
 
-    public static final class PEOPLE {
-        public static final int SERVICE_ID = 5;
-        public static final String ACTION = "com.google.android.gms.people.service.START";
+    public interface WALLET {
+        int SERVICE_ID = 4;
+        String ACTION = "com.google.android.gms.wallet.service.BIND";
     }
 
-    public static final class LOCATION {
-        public static final int SERVICE_ID = 6;
+    public interface PEOPLE {
+        int SERVICE_ID = 5;
+        String ACTION = "com.google.android.gms.people.service.START";
     }
 
-    public static final class APPSTATE {
-        public static final int SERVICE_ID = 7;
-        public static final String ACTION = "com.google.android.gms.appstate.service.START";
+    public interface LOCATION {
+        int SERVICE_ID = 6;
     }
 
-    public static final class ADREQUEST {
-        public static final int SERVICE_ID = 8;
-        public static final String ACTION = "com.google.android.gms.ads.service.START";
+    public interface APPSTATE {
+        int SERVICE_ID = 7;
+        String ACTION = "com.google.android.gms.appstate.service.START";
     }
 
-    public static final class ACCOUNT {
-        public static final int SERVICE_ID = 9;
-        public static final String ACTION = "com.google.android.gms.accounts.ACCOUNT_SERVICE";
+    public interface ADREQUEST {
+        int SERVICE_ID = 8;
+        String ACTION = "com.google.android.gms.ads.service.START";
     }
 
-    public static final class CAST {
-        public static final int SERVICE_ID = 10;
-        public static final String ACTION = "com.google.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE";
+    public interface ACCOUNT {
+        int SERVICE_ID = 9;
+        String ACTION = "com.google.android.gms.accounts.ACCOUNT_SERVICE";
     }
 
-    public static final class DRIVE {
-        public static final int SERVICE_ID = 11;
-        public static final String ACTION = "com.google.android.gms.drive.ApiService.START";
+    public interface CAST {
+        int SERVICE_ID = 10;
+        String ACTION = "com.google.android.gms.cast.service.BIND_CAST_DEVICE_CONTROLLER_SERVICE";
     }
 
-    public static final class ADDRESS {
-        public static final int SERVICE_ID = 12;
-        public static final String ACTION = "com.google.android.gms.identity.service.BIND";
+    public interface DRIVE {
+        int SERVICE_ID = 11;
+        String ACTION = "com.google.android.gms.drive.ApiService.START";
     }
 
-    public static final class CAR {
-        public static final int SERVICE_ID = 13;
-        public static final String ACTION = "com.google.android.gms.car.service.START";
+    public interface ADDRESS {
+        int SERVICE_ID = 12;
+        String ACTION = "com.google.android.gms.identity.service.BIND";
     }
 
-    public static final class WEARABLE {
-        public static final int SERVICE_ID = 14;
-        public static final String ACTION = "com.google.android.gms.wearable.BIND";
+    public interface CAR {
+        int SERVICE_ID = 13;
+        String ACTION = "com.google.android.gms.car.service.START";
     }
 
-    public static final class AUTH {
-        public static final int SERVICE_ID = 16;
-        public static final String ACTION = "com.google.android.gms.auth.service.START";
+    public interface WEARABLE {
+        int SERVICE_ID = 14;
+        String ACTION = "com.google.android.gms.wearable.BIND";
     }
 
-    public static final class FITNESS {
-        public static final int SERVICE_ID = 17;
-        public static final String ACTION = "com.google.android.gms.fitness.GoogleFitnessService.START";
+    public interface AUTH {
+        int SERVICE_ID = 16;
+        String ACTION = "com.google.android.gms.auth.service.START";
     }
 
-    public static final class REMINDERS {
-        public static final int SERVICE_ID = 18;
-        public static final String ACTION = "com.google.android.gms.reminders.service.START";
+    public interface FITNESS {
+        int SERVICE_ID = 17;
+        String ACTION = "com.google.android.gms.fitness.GoogleFitnessService.START";
     }
 
-    public static final class LIGHTWEIGHT_INDEX {
-        public static final int SERVICE_ID = 19;
-        public static final String ACTION = "com.google.android.gms.icing.LIGHTWEIGHT_INDEX_SERVICE";
+    public interface REMINDERS {
+        int SERVICE_ID = 18;
+        String ACTION = "com.google.android.gms.reminders.service.START";
     }
 
-    public static final class DEVICE_CONNECTION {
-        public static final int SERVICE_ID = 20;
-        public static final String ACTION = "com.google.android.gms.deviceconnection.service.START";
+    public interface LIGHTWEIGHT_INDEX {
+        int SERVICE_ID = 19;
+        String ACTION = "com.google.android.gms.icing.LIGHTWEIGHT_INDEX_SERVICE";
     }
 
-    public static final class INDEX {
-        public static final int SERVICE_ID = 21;
-        public static final String ACTION = "com.google.android.gms.icing.INDEX_SERVICE";
+    public interface DEVICE_CONNECTION {
+        int SERVICE_ID = 20;
+        String ACTION = "com.google.android.gms.deviceconnection.service.START";
     }
 
-    public static final class LOCATION_REPORTING {
-        public static final int SERVICE_ID = 22;
-        public static final String ACTION = "com.google.android.gms.location.reporting.service.START";
+    public interface INDEX {
+        int SERVICE_ID = 21;
+        String ACTION = "com.google.android.gms.icing.INDEX_SERVICE";
     }
 
-    public static final class LOCATION_MANAGER {
-        public static final int SERVICE_ID = 23;
-        public static final String ACTION = "com.google.android.location.internal.GoogleLocationManagerService.START";
+    public interface LOCATION_REPORTING {
+        int SERVICE_ID = 22;
+        String ACTION = "com.google.android.gms.location.reporting.service.START";
+        String ACTION_LEGACY = "com.google.android.location.reporting.service.START";
     }
 
-    public static final class PLAY_LOG {
-        public static final int SERVICE_ID = 24;
-        public static final String ACTION = "com.google.android.gms.playlog.service.START";
+    public interface LOCATION_MANAGER {
+        int SERVICE_ID = 23;
+        String ACTION_LEGACY = "com.google.android.location.internal.GoogleLocationManagerService.START";
     }
 
-    public static final class DROIDGUARD {
-        public static final int SERVICE_ID = 25;
-        public static final String ACTION = "com.google.android.gms.droidguard.service.START";
+    public interface PLAY_LOG {
+        int SERVICE_ID = 24;
+        String ACTION = "com.google.android.gms.playlog.service.START";
     }
 
-    public static final class LOCKBOX {
-        public static final int SERVICE_ID = 26;
-        public static final String ACTION = "com.google.android.gms.lockbox.service.START";
+    public interface DROIDGUARD {
+        int SERVICE_ID = 25;
+        String ACTION = "com.google.android.gms.droidguard.service.START";
     }
 
-    public static final class CAST_MIRRORING {
-        public static final int SERVICE_ID = 27;
-        public static final String ACTION = "com.google.android.gms.cast_mirroring.service.START";
+    public interface LOCKBOX {
+        int SERVICE_ID = 26;
+        String ACTION = "com.google.android.gms.lockbox.service.START";
     }
 
-    public static final class NETWORK_QUALITY {
-        public static final int SERVICE_ID = 28;
-        public static final String ACTION = "com.google.android.gms.mdm.services.START";
+    public interface CAST_MIRRORING {
+        int SERVICE_ID = 27;
+        String ACTION = "com.google.android.gms.cast_mirroring.service.START";
     }
 
-    public static final class FEEDBACK {
-        public static final int SERVICE_ID = 29;
-        public static final String ACTION = "com.google.android.gms.feedback.internal.IFeedbackService";
+    public interface NETWORK_QUALITY {
+        int SERVICE_ID = 28;
+        String ACTION = "com.google.android.gms.mdm.services.START";
     }
 
-    public static final class SEARCH_ADMINISTRATION {
-        public static final int SERVICE_ID = 30;
+    public interface FEEDBACK {
+        int SERVICE_ID = 29;
+        String ACTION = "com.google.android.gms.feedback.internal.IFeedbackService";
     }
 
-    public static final class PHOTO_AUTO_BACKUP {
-        public static final int SERVICE_ID = 31;
-        public static final String ACTION = "com.google.android.gms.photos.autobackup.service.START";
+    public interface SEARCH_ADMINISTRATION {
+        int SERVICE_ID = 30;
     }
 
-    public static final class SEARCH_QUERIES {
-        public static final int SERVICE_ID = 32;
+    public interface PHOTO_AUTO_BACKUP {
+        int SERVICE_ID = 31;
+        String ACTION = "com.google.android.gms.photos.autobackup.service.START";
     }
 
-    public static final class SEARCH_GLOBAL {
-        public static final int SERVICE_ID = 33;
+    public interface SEARCH_QUERIES {
+        int SERVICE_ID = 32;
     }
 
-    public static final class UDC {
-        public static final int SERVICE_ID = 35;
-        public static final String ACTION = "com.google.android.gms.udc.service.START";
+    public interface SEARCH_GLOBAL {
+        int SERVICE_ID = 33;
     }
 
-    public static final class SEARCH_CORPORA {
-        public static final int SERVICE_ID = 36;
+    public interface UDC {
+        int SERVICE_ID = 35;
+        String ACTION = "com.google.android.gms.udc.service.START";
     }
 
-    public static final class DEVICE_MANAGER {
-        public static final int SERVICE_ID = 37;
-        public static final String ACTION = "com.google.android.gms.mdm.services.DeviceManagerApiService.START";
+    public interface SEARCH_CORPORA {
+        int SERVICE_ID = 36;
     }
 
-    public static final class PSEUDONYMOUS_ID {
-        public static final int SERVICE_ID = 38;
-        public static final String ACTION = "com.google.android.gms.pseudonymous.service.START";
+    public interface DEVICE_MANAGER {
+        int SERVICE_ID = 37;
+        String ACTION = "com.google.android.gms.mdm.services.DeviceManagerApiService.START";
     }
 
-    public static final class COMMON {
-        public static final int SERVICE_ID = 39;
-        public static final String ACTION = "com.google.android.gms.common.service.START";
+    public interface PSEUDONYMOUS_ID {
+        int SERVICE_ID = 38;
+        String ACTION = "com.google.android.gms.pseudonymous.service.START";
     }
 
-    public static final class CLEARCUT_LOGGER {
-        public static final int SERVICE_ID = 40;
-        public static final String ACTION = "com.google.android.gms.clearcut.service.START";
+    public interface COMMON {
+        int SERVICE_ID = 39;
+        String ACTION = "com.google.android.gms.common.service.START";
     }
 
-    public static final class USAGE_REPORTING {
-        public static final int SERVICE_ID = 41;
-        public static final String ACTION = "com.google.android.gms.usagereporting.service.START";
+    public interface CLEARCUT_LOGGER {
+        int SERVICE_ID = 40;
+        String ACTION = "com.google.android.gms.clearcut.service.START";
     }
 
-    public static final class KIDS {
-        public static final int SERVICE_ID = 42;
-        public static final String ACTION = "com.google.android.gms.kids.service.START";
+    public interface USAGE_REPORTING {
+        int SERVICE_ID = 41;
+        String ACTION = "com.google.android.gms.usagereporting.service.START";
     }
 
-    public static final class DOWNLOAD {
-        public static final int SERVICE_ID = 43;
-        public static final String ACTION = "com.google.android.gms.common.download.START";
+    public interface KIDS {
+        int SERVICE_ID = 42;
+        String ACTION = "com.google.android.gms.kids.service.START";
     }
 
-    public static final class SIGN_IN {
-        public static final int SERVICE_ID = 44;
-        public static final String ACTION = "com.google.android.gms.signin.service.START";
+    public interface DOWNLOAD {
+        int SERVICE_ID = 43;
+        String ACTION = "com.google.android.gms.common.download.START";
     }
 
-    public static final class SAFETY_NET_CLIENT {
-        public static final int SERVICE_ID = 45;
-        public static final String ACTION = "com.google.android.gms.safetynet.service.START";
+    public interface SIGN_IN {
+        int SERVICE_ID = 44;
+        String ACTION = "com.google.android.gms.signin.service.START";
     }
 
-    public static final class GSERVICES {
-        public static final int SERVICE_ID = 46;
-        public static final String ACTION = "com.google.android.gms.ads.gservice.START";
+    public interface SAFETY_NET_CLIENT {
+        int SERVICE_ID = 45;
+        String ACTION = "com.google.android.gms.safetynet.service.START";
     }
 
-    public static final class CONTEXT_MANAGER {
-        public static final int SERVICE_ID = 47;
-        public static final String ACTION = "com.google.android.contextmanager.service.ContextManagerService.START";
+    public interface GSERVICES {
+        int SERVICE_ID = 46;
+        String ACTION = "com.google.android.gms.ads.gservice.START";
     }
 
-    public static final class AUDIO_MODEM {
-        public static final int SERVICE_ID = 48;
-        public static final String ACTION = "com.google.android.gms.audiomodem.service.AudioModemService.START";
+    public interface CONTEXT_MANAGER {
+        int SERVICE_ID = 47;
+        String ACTION = "com.google.android.contextmanager.service.ContextManagerService.START";
     }
 
-    public static final class NEARBY_SHARING {
-        public static final int SERVICE_ID = 49;
-        public static final String ACTION = "com.google.android.gms.nearby.sharing.service.NearbySharingService.START";
+    public interface AUDIO_MODEM {
+        int SERVICE_ID = 48;
+        String ACTION = "com.google.android.gms.audiomodem.service.AudioModemService.START";
     }
 
-    public static final class LIGHTWEIGHT_NETWORK_QUALITY {
-        public static final int SERVICE_ID = 51;
-        public static final String ACTION = "com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START";
+    public interface NEARBY_SHARING {
+        int SERVICE_ID = 49;
+        String ACTION = "com.google.android.gms.nearby.sharing.service.NearbySharingService.START";
     }
 
-    public static final class PHENOTYPE {
-        public static final int SERVICE_ID = 51;
-        public static final String ACTION = "com.google.android.gms.phenotype.service.START";
+    public interface LIGHTWEIGHT_NETWORK_QUALITY {
+        int SERVICE_ID = 51;
+        String ACTION = "com.google.android.gms.herrevad.services.LightweightNetworkQualityAndroidService.START";
     }
 
-    public static final class VOICE_UNLOCK {
-        public static final int SERVICE_ID = 52;
-        public static final String ACTION = "com.google.android.gms.speech.service.START";
+    public interface PHENOTYPE {
+        int SERVICE_ID = 51;
+        String ACTION = "com.google.android.gms.phenotype.service.START";
     }
 
-    public static final class NEARBY_CONNECTIONS {
-        public static final int SERVICE_ID = 54;
-        public static final String ACTION = "com.google.android.gms.nearby.connection.service.START";
+    public interface VOICE_UNLOCK {
+        int SERVICE_ID = 52;
+        String ACTION = "com.google.android.gms.speech.service.START";
     }
 
-    public static final class FITNESS_SENSORS {
-        public static final int SERVICE_ID = 55;
-        public static final String ACTION = "com.google.android.gms.fitness.SensorsApi";
+    public interface NEARBY_CONNECTIONS {
+        int SERVICE_ID = 54;
+        String ACTION = "com.google.android.gms.nearby.connection.service.START";
     }
 
-    public static final class FITNESS_RECORDING {
-        public static final int SERVICE_ID = 56;
-        public static final String ACTION = "com.google.android.gms.fitness.RecordingApi";
+    public interface FITNESS_SENSORS {
+        int SERVICE_ID = 55;
+        String ACTION = "com.google.android.gms.fitness.SensorsApi";
     }
 
-    public static final class FITNESS_HISTORY {
-        public static final int SERVICE_ID = 57;
-        public static final String ACTION = "com.google.android.gms.fitness.HistoryApi";
+    public interface FITNESS_RECORDING {
+        int SERVICE_ID = 56;
+        String ACTION = "com.google.android.gms.fitness.RecordingApi";
     }
 
-    public static final class FITNESS_SESSIONS {
-        public static final int SERVICE_ID = 58;
-        public static final String ACTION = "com.google.android.gms.fitness.SessionsApi";
+    public interface FITNESS_HISTORY {
+        int SERVICE_ID = 57;
+        String ACTION = "com.google.android.gms.fitness.HistoryApi";
+    }
+
+    public interface FITNESS_SESSIONS {
+        int SERVICE_ID = 58;
+        String ACTION = "com.google.android.gms.fitness.SessionsApi";
     }
 
     /**
      * BLE = Bluetooth Low Energy
      */
-    public static final class FITNESS_BLE {
-        public static final int SERVICE_ID = 59;
-        public static final String ACTION = "com.google.android.gms.fitness.BleApi";
+    public interface FITNESS_BLE {
+        int SERVICE_ID = 59;
+        String ACTION = "com.google.android.gms.fitness.BleApi";
     }
 
-    public static final class FITNESS_CONFIG {
-        public static final int SERVICE_ID = 60;
-        public static final String ACTION = "com.google.android.gms.fitness.ConfigApi";
+    public interface FITNESS_CONFIG {
+        int SERVICE_ID = 60;
+        String ACTION = "com.google.android.gms.fitness.ConfigApi";
     }
 
-    public static final class FITNESS_INTERNAL {
-        public static final int SERVICE_ID = 61;
-        public static final String ACTION = "com.google.android.gms.fitness.InternalApi";
+    public interface FITNESS_INTERNAL {
+        int SERVICE_ID = 61;
+        String ACTION = "com.google.android.gms.fitness.InternalApi";
     }
 
-    public static final class NEARBY_MESSAGES {
-        public static final int SERVICE_ID = 62;
-        public static final String ACTION = "com.google.android.gms.nearby.messages.service.NearbyMessagesService.START";
+    public interface NEARBY_MESSAGES {
+        int SERVICE_ID = 62;
+        String ACTION = "com.google.android.gms.nearby.messages.service.NearbyMessagesService.START";
     }
 
-    public static final class HELP {
-        public static final int SERVICE_ID = 63;
-        public static final String ACTION = "com.google.android.gms.googlehelp.service.GoogleHelpService.START";
+    public interface HELP {
+        int SERVICE_ID = 63;
+        String ACTION = "com.google.android.gms.googlehelp.service.GoogleHelpService.START";
     }
 
-    public static final class CONFIG {
-        public static final int SERVICE_ID = 64;
-        public static final String ACTION = "com.google.android.gms.config.START";
+    public interface CONFIG {
+        int SERVICE_ID = 64;
+        String ACTION = "com.google.android.gms.config.START";
     }
 
-    public static final class GEODATA {
-        public static final int SERVICE_ID = 65;
+    public interface GEODATA {
+        int SERVICE_ID = 65;
     }
 
-    public static final class SEARCH_IME {
-        public static final int SERVICE_ID = 66;
+    public interface SEARCH_IME {
+        int SERVICE_ID = 66;
     }
 
-    public static final class PLACE_DETECTION {
-        public static final int SERVICE_ID = 67;
+    public interface PLACE_DETECTION {
+        int SERVICE_ID = 67;
     }
 
-    public static final class CREDENTIALS {
-        public static final int SERVICE_ID = 68;
-        public static final String ACTION = "com.google.android.gms.auth.api.credentials.service.START";
+    public interface CREDENTIALS {
+        int SERVICE_ID = 68;
+        String ACTION = "com.google.android.gms.auth.api.credentials.service.START";
+    }
+
+    public interface ADVERTISING_ID {
+        // Has no service id
+        String ACTION = "com.google.android.gms.ads.identifier.service.START";
     }
 
     public static String nameFromServiceId(int serviceId) {