diff --git a/.bazelrc b/.bazelrc
index 6b0e02af6..e57ca0723 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -23,6 +23,7 @@ common --ios_simulator_version="18.5"
 
 # Cache Flags
 common --action_cache_store_output_metadata --experimental_remote_cache_compression_threshold=100
+common --noslim_profile --experimental_profile_include_target_label --experimental_profile_include_primary_output
 
 build --bes_results_url=https://app.buildbuddy.io/invocation/
 build --bes_backend=grpcs://remote.buildbuddy.io
diff --git a/.circleci/config.yml b/.circleci/config.yml
index a5323a648..358316916 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -213,13 +213,13 @@ jobs:
             mkdir -p _ios_coverage/lcov
             cp -r $(bazel info output_path)/_coverage/_coverage_report.dat _ios_coverage/lcov/
 
+      - store_test_results:
+          path: _test_results
+
       - persist_to_workspace:
           root: .
           paths:
-            - _ios_coverage
-
-      - store_test_results:
-          path: _test_results
+            - .
 
   test:
     executor: base
@@ -244,6 +244,11 @@ jobs:
       - store_test_results:
           path: _test_results
 
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .
+
   android_test:
     executor: android
     steps:
@@ -273,12 +278,21 @@ jobs:
               cp $line $RESULTS_DIR/$(dirname $line)
             done
 
+      - run: bazel build //jvm/core
+
+      - auto_shipit
+
       - store_test_results:
           path: _test_results
 
       - store_artifacts:
           path: screenshots
 
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .
+
   coverage:
     executor: base
     steps: