diff --git a/play-services-core/src/main/java/org/microg/gms/measurement/MeasurementBrokerService.java b/play-services-core/src/main/java/org/microg/gms/measurement/MeasurementBrokerService.java
new file mode 100644
index 00000000..49dcda79
--- /dev/null
+++ b/play-services-core/src/main/java/org/microg/gms/measurement/MeasurementBrokerService.java
@@ -0,0 +1,39 @@
+/*	
+ * Copyright (C) 2018 microG Project Team	
+ *	
+ * Licensed under the Apache License, Version 2.0 (the "License");	
+ * you may not use this file except in compliance with the License.	
+ * You may obtain a copy of the License at	
+ *	
+ *     http://www.apache.org/licenses/LICENSE-2.0	
+ *	
+ * Unless required by applicable law or agreed to in writing, software	
+ * distributed under the License is distributed on an "AS IS" BASIS,	
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	
+ * See the License for the specific language governing permissions and	
+ * limitations under the License.	
+ */	
+
+package org.microg.gms.measurement;	
+
+import android.os.RemoteException;	
+import android.util.Log;	
+
+import com.google.android.gms.common.api.CommonStatusCodes;	
+import com.google.android.gms.common.api.Status;	
+import com.google.android.gms.common.internal.GetServiceRequest;	
+import com.google.android.gms.common.internal.IGmsCallbacks;	
+
+import org.microg.gms.BaseService;	
+import org.microg.gms.common.GmsService;	
+
+public class MeasurementBrokerService extends BaseService {	
+    public MeasurementBrokerService() {	
+        super("GmsMeasureBrokerSvc", GmsService.MEASUREMENT);	
+    }	
+
+    @Override	
+    public void handleServiceRequest(IGmsCallbacks callback, GetServiceRequest request, GmsService service) throws RemoteException {	
+        callback.onPostInitComplete(CommonStatusCodes.SUCCESS, new MeasurementServiceImpl().asBinder(), null);	
+    }	
+} 
diff --git a/play-services-core/src/main/java/org/microg/gms/measurement/MeasurementServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/measurement/MeasurementServiceImpl.java
new file mode 100644
index 00000000..bba81666
--- /dev/null
+++ b/play-services-core/src/main/java/org/microg/gms/measurement/MeasurementServiceImpl.java
@@ -0,0 +1,34 @@
+/*	
+ * Copyright (C) 2018 microG Project Team	
+ *	
+ * Licensed under the Apache License, Version 2.0 (the "License");	
+ * you may not use this file except in compliance with the License.	
+ * You may obtain a copy of the License at	
+ *	
+ *     http://www.apache.org/licenses/LICENSE-2.0	
+ *	
+ * Unless required by applicable law or agreed to in writing, software	
+ * distributed under the License is distributed on an "AS IS" BASIS,	
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	
+ * See the License for the specific language governing permissions and	
+ * limitations under the License.	
+ */	
+
+package org.microg.gms.measurement;	
+
+import android.os.Parcel;	
+import android.os.RemoteException;	
+import android.util.Log;	
+
+import com.google.android.gms.measurement.internal.IMeasurementService;	
+
+public class MeasurementServiceImpl extends IMeasurementService.Stub {	
+    private static final String TAG = "GmsMeasureSvcImpl";	
+
+    @Override	
+    public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException {	
+        if (super.onTransact(code, data, reply, flags)) return true;	
+        Log.d(TAG, "onTransact [unknown]: " + code + ", " + data + ", " + flags);	
+        return false;	
+    }	
+}