Address comments

src/main/java/com/google/devtools/build/lib/actions/ActionExecutionMetadata.java

@@ -116,7 +116,7 @@ default boolean mayInsensitivelyPropagateInputs() {
   }
 
   /**
-   * Returns true if the action may modify its outputs after executing spawns.
+   * Returns true if the action may modify spawn outputs after the spawn has executed.
    *
    * <p>If this returns true, any kind of spawn output caching or reuse needs to happen
    * synchronously directly after the spawn execution.

src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java

@@ -129,8 +129,6 @@ public CacheHandle lookup(Spawn spawn, SpawnExecutionContext context)
           previousExecution =
               previousOrThisExecution == thisExecution ? null : previousOrThisExecution;
         }
-        // Metadata will be available in context.current() until we detach.
-        // This is done via a thread-local variable.
         try {
           RemoteActionResult result;
           try (SilentCloseable c =
@@ -269,7 +267,9 @@ public void store(SpawnResult result) throws ExecException, InterruptedException
             // existing executions finish the reuse.
             // Note that while this call itself isn't interruptible, all operations it awaits are
             // interruptible.
-            thisExecutionFinal.awaitAllOutputReuse();
+            try (SilentCloseable c = prof.profile(REMOTE_DOWNLOAD, "await output reuse")) {
+              thisExecutionFinal.awaitAllOutputReuse();
+            }
           }
         }
 

src/main/java/com/google/devtools/build/lib/rules/java/JavaCompileAction.java

@@ -713,7 +713,7 @@ public NestedSet<Artifact> getPossibleInputsForTesting() {
   public boolean mayModifySpawnOutputsAfterExecution() {
     // Causes of spawn output modification after execution:
     // - Fallback to the full classpath with --experimental_java_classpath=bazel.
-    // - In-place rewriting of .jdeps files when with --experimental_output_paths=strip.
+    // - In-place rewriting of .jdeps files with --experimental_output_paths=strip.
     return true;
   }
 

src/main/java/com/google/devtools/build/lib/rules/java/JavaHeaderCompileAction.java

@@ -160,7 +160,7 @@ protected void afterExecute(
   @Override
   public boolean mayModifySpawnOutputsAfterExecution() {
     // Causes of spawn output modification after execution:
-    // - In-place rewriting of .jdeps files when with --experimental_output_paths=strip.
+    // - In-place rewriting of .jdeps files with --experimental_output_paths=strip.
     // TODO: Use separate files as action and spawn output to avoid in-place modification.
     return true;
   }