diff --git a/api/current.txt b/api/current.txt
index ceb6bc8eb0c24..a92e9b7b65ee0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29368,7 +29368,6 @@ package android.os.health {
   }
 
   public class SystemHealthManager {
-    method public static android.os.health.SystemHealthManager from(android.content.Context);
     method public android.os.health.HealthStats takeMyUidSnapshot();
     method public android.os.health.HealthStats takeUidSnapshot(int);
     method public android.os.health.HealthStats[] takeUidSnapshots(int[]);
diff --git a/api/system-current.txt b/api/system-current.txt
index 9145f3d8cf125..76b05b5871318 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -31904,7 +31904,6 @@ package android.os.health {
   }
 
   public class SystemHealthManager {
-    method public static android.os.health.SystemHealthManager from(android.content.Context);
     method public android.os.health.HealthStats takeMyUidSnapshot();
     method public android.os.health.HealthStats takeUidSnapshot(int);
     method public android.os.health.HealthStats[] takeUidSnapshots(int[]);
diff --git a/api/test-current.txt b/api/test-current.txt
index 842664f2aa868..4c07871ea7bb6 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -29438,7 +29438,6 @@ package android.os.health {
   }
 
   public class SystemHealthManager {
-    method public static android.os.health.SystemHealthManager from(android.content.Context);
     method public android.os.health.HealthStats takeMyUidSnapshot();
     method public android.os.health.HealthStats takeUidSnapshot(int);
     method public android.os.health.HealthStats[] takeUidSnapshots(int[]);
diff --git a/core/java/android/os/health/SystemHealthManager.java b/core/java/android/os/health/SystemHealthManager.java
index 7c37fa40154f3..32e8425cbe07b 100644
--- a/core/java/android/os/health/SystemHealthManager.java
+++ b/core/java/android/os/health/SystemHealthManager.java
@@ -53,6 +53,8 @@ public class SystemHealthManager {
 
     /**
      * Obtain a SystemHealthManager object for the supplied context.
+     *
+     * @hide
      */
     public static SystemHealthManager from(Context context) {
         return (SystemHealthManager)context.getSystemService(Context.SYSTEM_HEALTH_SERVICE);
diff --git a/core/java/com/android/internal/app/procstats/ProcessState.java b/core/java/com/android/internal/app/procstats/ProcessState.java
index 80d60706e0ea0..8c5df08f54998 100644
--- a/core/java/com/android/internal/app/procstats/ProcessState.java
+++ b/core/java/com/android/internal/app/procstats/ProcessState.java
@@ -277,7 +277,7 @@ public final class ProcessState {
         if (!mDead) {
             return;
         }
-        Slog.wtfStack(TAG, "ProcessState dead: name=" + mName
+        Slog.w(TAG, "ProcessState dead: name=" + mName
                 + " pkg=" + mPackage + " uid=" + mUid + " common.name=" + mCommonProcess.mName);
     }