diff --git a/nearby/README.md b/nearby/README.md
index 120de1d..b4dff61 100644
--- a/nearby/README.md
+++ b/nearby/README.md
@@ -26,7 +26,7 @@
 ```sh
 $ source build/envsetup.sh && lunch <TARGE>
 $ cd packages/modules/Nearby
-$ aidegen
+$ aidegen .
 # This will launch Intellij project for Nearby module.
 ```
 
@@ -34,6 +34,6 @@
 
 ```sh
 $ source build/envsetup.sh && lunch <TARGE>
-$mmm -j packages/modules/Nearby/
-$adb install -r {ANDROID_PRODUCT_OUT}/system/apex/com.android.nearby.apex
-```
\ No newline at end of file
+$ mmm -j packages/modules/Nearby/
+$ adb install -r {ANDROID_PRODUCT_OUT}/system/apex/com.android.nearby.apex
+```
diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp
index 5b026fa..13dd6a9 100644
--- a/nearby/service/Android.bp
+++ b/nearby/service/Android.bp
@@ -43,6 +43,7 @@
     optimize: {
         enabled: true,
         shrink: true,
+        proguard_flags_files: ["proguard.flags"],
     },
     dex_preopt: {
         enabled: false,
diff --git a/nearby/service/java/com/android/server/nearby/NearbyService.java b/nearby/service/java/com/android/server/nearby/NearbyService.java
index 5647a4d..d0d7c94 100644
--- a/nearby/service/java/com/android/server/nearby/NearbyService.java
+++ b/nearby/service/java/com/android/server/nearby/NearbyService.java
@@ -17,15 +17,19 @@
 package com.android.server.nearby;
 
 import android.content.Context;
+import android.util.Log;
 
 import com.android.server.SystemService;
 
 /**
  * Service implementing nearby functionality. The actual implementation is delegated to
- * {@link NearbyDeviceScanServiceImpl}.
+ * {@link NearbyServiceImpl}.
  */
 // TODO(189954300): Implement nearby service.
 public class NearbyService extends SystemService {
+    private static final String TAG = "NearbyService";
+    private static final boolean DBG = true;
+
     private final NearbyServiceImpl mImpl;
 
     public NearbyService(Context contextBase) {
@@ -35,6 +39,10 @@
 
     @Override
     public void onStart() {
+        if (DBG) {
+            Log.d(TAG, "Publishing NearbyService");
+        }
+
     }
 
     @Override
diff --git a/nearby/service/proguard.flags b/nearby/service/proguard.flags
new file mode 100644
index 0000000..55c963f
--- /dev/null
+++ b/nearby/service/proguard.flags
@@ -0,0 +1,5 @@
+# Prevent proguard from stripping out any nearby-service.
+# TODO: This could be optimized in the future to only keep the critical
+# entry points and then let proguard strip out any unused code within
+# the service.
+-keep class com.android.server.nearby.** { *; }
diff --git a/nearby/tests/Android.bp b/nearby/tests/Android.bp
index 09fe5ea..67a3b83 100644
--- a/nearby/tests/Android.bp
+++ b/nearby/tests/Android.bp
@@ -33,8 +33,9 @@
 
     static_libs: [
         "androidx.test.rules",
-        "truth-prebuilt",
         "framework-nearby-pre-jarjar",
+        "platform-test-annotations",
+        "truth-prebuilt",
     ],
     test_suites: [
         "general-tests",
diff --git a/nearby/tests/src/android/nearby/ScanRequestTest.java b/nearby/tests/src/android/nearby/ScanRequestTest.java
index 12c8edc..ab9f161 100644
--- a/nearby/tests/src/android/nearby/ScanRequestTest.java
+++ b/nearby/tests/src/android/nearby/ScanRequestTest.java
@@ -25,13 +25,18 @@
 
 import android.os.Parcel;
 import android.os.WorkSource;
+import android.platform.test.annotations.Presubmit;
 
 import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 /** Units tests for {@link ScanRequest}. */
+@Presubmit
 @SmallTest
+@RunWith(AndroidJUnit4.class)
 public class ScanRequestTest {
 
     /** Test creating a scan request. */