Snap for 10447354 from ea0a57a4c8d7a2cd338cdb53746e570d8d3a5692 to mainline-cellbroadcast-release

Change-Id: Ic33cf2fb4848031287748b9c9914e31119d2af8d
diff --git a/Android.bp b/Android.bp
index 1b291b2..fff8b04 100644
--- a/Android.bp
+++ b/Android.bp
@@ -35,9 +35,4 @@
     srcs: [
         "six.py",
     ],
-    version: {
-        py2: {
-            enabled: true,
-        },
-    },
 }
diff --git a/OWNERS b/OWNERS
index 86bfc9e..9a6f87a 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,2 @@
-# Default owners are top 3 or more active developers of the past 1 or 2 years
-# or people with more than 10 commits last year.
-# Please update this list if you find better owner candidates.
-yim@google.com
+colefaust@google.com
+krzysio@google.com