diff --git a/tensorflow/tools/compatibility/module_deprecations_v2.py b/tensorflow/tools/compatibility/module_deprecations_v2.py
index b1adbe79fda..129a85459f2 100644
--- a/tensorflow/tools/compatibility/module_deprecations_v2.py
+++ b/tensorflow/tools/compatibility/module_deprecations_v2.py
@@ -30,9 +30,8 @@ _CONTRIB_WARNING = (
 
 _FLAGS_WARNING = (
     ast_edits.ERROR,
-    "tf.flags has been removed, please use the argparse or absl"
-    " modules if you need command line parsing."
-)
+    "tf.flags and tf.app.flags have been removed, please use the argparse or "
+    "absl modules if you need command line parsing.")
 
 _CONTRIB_CUDNN_RNN_WARNING = (
     ast_edits.WARNING,
@@ -65,6 +64,7 @@ MODULE_DEPRECATIONS = {
     "tf.contrib.cudnn_rnn": _CONTRIB_CUDNN_RNN_WARNING,
     "tf.contrib.rnn": _CONTRIB_RNN_WARNING,
     "tf.flags": _FLAGS_WARNING,
+    "tf.app.flags": _FLAGS_WARNING,
     "tf.contrib.distribute": _CONTRIB_DIST_STRAT_WARNING,
     "tf.contrib.seq2seq": _CONTRIB_SEQ2SEQ_WARNING
 }
diff --git a/tensorflow/tools/compatibility/renames_v2.py b/tensorflow/tools/compatibility/renames_v2.py
index b0b29fc2d99..bf459bdb3f1 100644
--- a/tensorflow/tools/compatibility/renames_v2.py
+++ b/tensorflow/tools/compatibility/renames_v2.py
@@ -154,6 +154,8 @@ renames = {
         'tf.math.angle',
     'tf.app.run':
         'tf.compat.v1.app.run',
+    'tf.app.flags':
+        'tf.compat.v1.app.flags',
     'tf.assert_greater_equal':
         'tf.compat.v1.assert_greater_equal',
     'tf.assert_integer':
diff --git a/tensorflow/tools/compatibility/tf_upgrade_v2_test.py b/tensorflow/tools/compatibility/tf_upgrade_v2_test.py
index 6bdf65135ad..1249ce7cc2f 100644
--- a/tensorflow/tools/compatibility/tf_upgrade_v2_test.py
+++ b/tensorflow/tools/compatibility/tf_upgrade_v2_test.py
@@ -1658,11 +1658,11 @@ def _log_prob(self, x):
 
   def test_flags_bare(self):
     _, _, errors, _ = self._upgrade("tf.flags")
-    self.assertIn("tf.flags has been removed", errors[0])
+    self.assertIn("tf.flags and tf.app.flags have been removed", errors[0])
 
   def test_flags_flags(self):
     _, _, errors, _ = self._upgrade("tf.flags.FLAGS")
-    self.assertIn("tf.flags has been removed", errors[0])
+    self.assertIn("tf.flags and tf.app.flags have been removed", errors[0])
 
   def test_contrib_estimator_head_deprecation(self):
     api_symbols = ["binary_classification_head", "logistic_regression_head",
@@ -1916,6 +1916,12 @@ def _log_prob(self, x):
     _, _, _, new_text = self._upgrade(text)
     self.assertEqual(expected, new_text)
 
+  def test_app_flags(self):
+    text = "flags = tf.app.flags"
+    expected = "flags = tf.compat.v1.app.flags"
+    _, _, _, new_text = self._upgrade(text)
+    self.assertEqual(expected, new_text)
+
   def test_uniform_unit_scaling_initializer(self):
     text = "tf.uniform_unit_scaling_initializer(0.5)"
     expected_text = ("tf.compat.v1.keras.initializers.VarianceScaling("