diff --git a/api/current.txt b/api/current.txt
index fc1822647986f..6c9d7ce5ed9d3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -23626,7 +23626,6 @@ package android.net {
     method public boolean isConnected();
     method public boolean isConnectedOrConnecting();
     method public boolean isFailover();
-    method public boolean isMetered();
     method public boolean isRoaming();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR;
diff --git a/api/system-current.txt b/api/system-current.txt
index 5e8562b38ca28..04e740a85c81d 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -25448,7 +25448,6 @@ package android.net {
     method public boolean isConnected();
     method public boolean isConnectedOrConnecting();
     method public boolean isFailover();
-    method public boolean isMetered();
     method public boolean isRoaming();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR;
diff --git a/api/test-current.txt b/api/test-current.txt
index f3f370b94e8f8..59d791afc9353 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -23695,7 +23695,6 @@ package android.net {
     method public boolean isConnected();
     method public boolean isConnectedOrConnecting();
     method public boolean isFailover();
-    method public boolean isMetered();
     method public boolean isRoaming();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.net.NetworkInfo> CREATOR;
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 9eb9423dd13e6..c297280e477f5 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -1415,6 +1415,8 @@ public abstract class Context {
      * this context. This is typically used to migrate data between storage
      * locations after an upgrade, such as migrating to device protected
      * storage.
+     * <p>
+     * The database must be closed before being moved.
      *
      * @param sourceContext The source context which contains the existing
      *            database to move.
diff --git a/core/java/android/net/NetworkInfo.java b/core/java/android/net/NetworkInfo.java
index b6c5c6fa966f8..42f5feb583394 100644
--- a/core/java/android/net/NetworkInfo.java
+++ b/core/java/android/net/NetworkInfo.java
@@ -334,6 +334,7 @@ public class NetworkInfo implements Parcelable {
      *
      * @return {@code true} if large transfers should be avoided, otherwise
      *         {@code false}.
+     * @hide
      */
     public boolean isMetered() {
         synchronized (this) {