Fix an assortment of lint bugs.

Test: ./gradlew lintRelease
Change-Id: Ic94d74eaa76898519f273bbf27dc62cd0e0f372f
diff --git a/compat/lint-baseline.xml b/compat/lint-baseline.xml
index fb44511..8eec225 100644
--- a/compat/lint-baseline.xml
+++ b/compat/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/core-ui/lint-baseline.xml b/core-ui/lint-baseline.xml
index b373b5e..412bb63 100644
--- a/core-ui/lint-baseline.xml
+++ b/core-ui/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="WrongConstant"
diff --git a/core-utils/java/android/support/v4/content/PermissionChecker.java b/core-utils/java/android/support/v4/content/PermissionChecker.java
index f0c7e74..0866273 100644
--- a/core-utils/java/android/support/v4/content/PermissionChecker.java
+++ b/core-utils/java/android/support/v4/content/PermissionChecker.java
@@ -89,6 +89,7 @@
      * @return The permission check result which is either {@link #PERMISSION_GRANTED}
      *     or {@link #PERMISSION_DENIED} or {@link #PERMISSION_DENIED_APP_OP}.
      */
+    @PermissionResult
     public static int checkPermission(@NonNull Context context, @NonNull String permission,
             int pid, int uid, String packageName) {
         if (context.checkPermission(permission, pid, uid) == PackageManager.PERMISSION_DENIED) {
@@ -125,6 +126,7 @@
      * @return The permission check result which is either {@link #PERMISSION_GRANTED}
      *     or {@link #PERMISSION_DENIED} or {@link #PERMISSION_DENIED_APP_OP}.
      */
+    @PermissionResult
     public static int checkSelfPermission(@NonNull Context context,
             @NonNull String permission) {
         return checkPermission(context, permission, android.os.Process.myPid(),
@@ -142,10 +144,11 @@
      * @return The permission check result which is either {@link #PERMISSION_GRANTED}
      *     or {@link #PERMISSION_DENIED} or {@link #PERMISSION_DENIED_APP_OP}.
      */
+    @PermissionResult
     public static int checkCallingPermission(@NonNull Context context,
             @NonNull String permission, String packageName) {
         if (Binder.getCallingPid() == Process.myPid()) {
-            return PackageManager.PERMISSION_DENIED;
+            return PERMISSION_DENIED;
         }
         return checkPermission(context, permission, Binder.getCallingPid(),
                 Binder.getCallingUid(), packageName);
@@ -160,6 +163,7 @@
      * @return The permission check result which is either {@link #PERMISSION_GRANTED}
      *     or {@link #PERMISSION_DENIED} or {@link #PERMISSION_DENIED_APP_OP}.
      */
+    @PermissionResult
     public static int checkCallingOrSelfPermission(@NonNull Context context,
             @NonNull String permission) {
         String packageName = (Binder.getCallingPid() == Process.myPid())
diff --git a/core-utils/lint-baseline.xml b/core-utils/lint-baseline.xml
index fb44511..8eec225 100644
--- a/core-utils/lint-baseline.xml
+++ b/core-utils/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/customtabs/lint-baseline.xml b/customtabs/lint-baseline.xml
index fb44511..8eec225 100644
--- a/customtabs/lint-baseline.xml
+++ b/customtabs/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/design/lint-baseline.xml b/design/lint-baseline.xml
index d533bd0..0618190 100644
--- a/design/lint-baseline.xml
+++ b/design/lint-baseline.xml
@@ -1,42 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
-
-    <issue
-        id="MissingPermission"
-        message="Missing permissions required by LocationManager.getLastKnownLocation: android.permission.ACCESS_COARSE_LOCATION or android.permission.ACCESS_FINE_LOCATION"
-        errorLine1="                    return mLocationManager.getLastKnownLocation(provider);"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/app/TwilightManager.java"
-            line="128"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="MissingSuperCall"
-        message="Overriding method should call `super.draw`"
-        errorLine1="    public void draw(Canvas canvas) {"
-        errorLine2="                ~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewStubCompat.java"
-            line="151"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="DuplicateIds"
-        message="Duplicate id `@+id/image`, already defined earlier in this layout"
-        errorLine1="        &lt;ImageView android:id=&quot;@+id/image&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="62"
-            column="20"/>
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="40"
-            column="20"/>
-    </issue>
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="ResourceType"
@@ -50,160 +13,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="                    final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                            ~~~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="347"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="ResourceType"
-        message="Expected resource of type layout"
-        errorLine1="            parser = mContext.getResources().getLayout(menuRes);"
-        errorLine2="                                                       ~~~~~~~">
-        <location
-            file="src/android/support/v7/view/SupportMenuInflater.java"
-            line="123"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="868"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildWidth, MeasureSpec.EXACTLY),"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="1286"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="62"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="            Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="67"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set content description via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="87"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                        Log.d(TAG, &quot;[loadDrawableFromDelegates] Skipping drawable: &quot;"
-        errorLine2="                              ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="315"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.i(TAG, &quot;[loadDrawableFromDelegates] Returning cached drawable: &quot; +"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="337"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                            Log.i(TAG, &quot;[loadDrawableFromDelegates] Saved drawable to cache: &quot; +"
-        errorLine2="                                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="372"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.e(TAG, &quot;Exception while inflating drawable&quot;, e);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="377"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                Log.d(TAG, &quot;[tintDrawableUsingColorFilter] Tinted &quot;"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="482"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="            Log.d(TAG, &quot;Mutated drawable is not the same instance as the input.&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="698"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
-        errorLine1="        return 0;"
-        errorLine2="               ~">
-        <location
-            file="src/android/support/v7/widget/ActionBarBackgroundDrawable.java"
-            line="59"
-            column="16"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
         message="Must be one or more of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
         errorLine1="                            + gravityToString(childGravity) + &quot; but this &quot; + TAG + &quot; already has a &quot;"
@@ -221,7 +30,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
@@ -232,7 +41,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
diff --git a/dynamic-animation/lint-baseline.xml b/dynamic-animation/lint-baseline.xml
index fb44511..8eec225 100644
--- a/dynamic-animation/lint-baseline.xml
+++ b/dynamic-animation/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/emoji/appcompat/lint-baseline.xml b/emoji/appcompat/lint-baseline.xml
index d533bd0..0618190 100644
--- a/emoji/appcompat/lint-baseline.xml
+++ b/emoji/appcompat/lint-baseline.xml
@@ -1,42 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
-
-    <issue
-        id="MissingPermission"
-        message="Missing permissions required by LocationManager.getLastKnownLocation: android.permission.ACCESS_COARSE_LOCATION or android.permission.ACCESS_FINE_LOCATION"
-        errorLine1="                    return mLocationManager.getLastKnownLocation(provider);"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/app/TwilightManager.java"
-            line="128"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="MissingSuperCall"
-        message="Overriding method should call `super.draw`"
-        errorLine1="    public void draw(Canvas canvas) {"
-        errorLine2="                ~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewStubCompat.java"
-            line="151"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="DuplicateIds"
-        message="Duplicate id `@+id/image`, already defined earlier in this layout"
-        errorLine1="        &lt;ImageView android:id=&quot;@+id/image&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="62"
-            column="20"/>
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="40"
-            column="20"/>
-    </issue>
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="ResourceType"
@@ -50,160 +13,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="                    final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                            ~~~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="347"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="ResourceType"
-        message="Expected resource of type layout"
-        errorLine1="            parser = mContext.getResources().getLayout(menuRes);"
-        errorLine2="                                                       ~~~~~~~">
-        <location
-            file="src/android/support/v7/view/SupportMenuInflater.java"
-            line="123"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="868"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildWidth, MeasureSpec.EXACTLY),"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="1286"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="62"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="            Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="67"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set content description via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="87"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                        Log.d(TAG, &quot;[loadDrawableFromDelegates] Skipping drawable: &quot;"
-        errorLine2="                              ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="315"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.i(TAG, &quot;[loadDrawableFromDelegates] Returning cached drawable: &quot; +"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="337"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                            Log.i(TAG, &quot;[loadDrawableFromDelegates] Saved drawable to cache: &quot; +"
-        errorLine2="                                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="372"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.e(TAG, &quot;Exception while inflating drawable&quot;, e);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="377"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                Log.d(TAG, &quot;[tintDrawableUsingColorFilter] Tinted &quot;"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="482"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="            Log.d(TAG, &quot;Mutated drawable is not the same instance as the input.&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="698"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
-        errorLine1="        return 0;"
-        errorLine2="               ~">
-        <location
-            file="src/android/support/v7/widget/ActionBarBackgroundDrawable.java"
-            line="59"
-            column="16"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
         message="Must be one or more of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
         errorLine1="                            + gravityToString(childGravity) + &quot; but this &quot; + TAG + &quot; already has a &quot;"
@@ -221,7 +30,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
@@ -232,7 +41,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
diff --git a/emoji/bundled/lint-baseline.xml b/emoji/bundled/lint-baseline.xml
index fb44511..8eec225 100644
--- a/emoji/bundled/lint-baseline.xml
+++ b/emoji/bundled/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/emoji/core/lint-baseline.xml b/emoji/core/lint-baseline.xml
index fb44511..8eec225 100644
--- a/emoji/core/lint-baseline.xml
+++ b/emoji/core/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/exifinterface/lint-baseline.xml b/exifinterface/lint-baseline.xml
index fb44511..8eec225 100644
--- a/exifinterface/lint-baseline.xml
+++ b/exifinterface/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/fragment/lint-baseline.xml b/fragment/lint-baseline.xml
index b373b5e..412bb63 100644
--- a/fragment/lint-baseline.xml
+++ b/fragment/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="WrongConstant"
diff --git a/graphics/drawable/animated/lint-baseline.xml b/graphics/drawable/animated/lint-baseline.xml
index 858c2c7..8486755 100644
--- a/graphics/drawable/animated/lint-baseline.xml
+++ b/graphics/drawable/animated/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="ResourceType"
diff --git a/graphics/drawable/static/lint-baseline.xml b/graphics/drawable/static/lint-baseline.xml
index fb44511..8eec225 100644
--- a/graphics/drawable/static/lint-baseline.xml
+++ b/graphics/drawable/static/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/media-compat/lint-baseline.xml b/media-compat/lint-baseline.xml
index fb44511..8eec225 100644
--- a/media-compat/lint-baseline.xml
+++ b/media-compat/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/percent/lint-baseline.xml b/percent/lint-baseline.xml
index fb44511..8eec225 100644
--- a/percent/lint-baseline.xml
+++ b/percent/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/recommendation/lint-baseline.xml b/recommendation/lint-baseline.xml
index b373b5e..412bb63 100644
--- a/recommendation/lint-baseline.xml
+++ b/recommendation/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="WrongConstant"
diff --git a/transition/lint-baseline.xml b/transition/lint-baseline.xml
index b373b5e..412bb63 100644
--- a/transition/lint-baseline.xml
+++ b/transition/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="WrongConstant"
diff --git a/tv-provider/lint-baseline.xml b/tv-provider/lint-baseline.xml
index 8126671..4d27812 100644
--- a/tv-provider/lint-baseline.xml
+++ b/tv-provider/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="WrongConstant"
diff --git a/v13/lint-baseline.xml b/v13/lint-baseline.xml
index b373b5e..412bb63 100644
--- a/v13/lint-baseline.xml
+++ b/v13/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="WrongConstant"
diff --git a/v14/preference/lint-baseline.xml b/v14/preference/lint-baseline.xml
index ee21bc3..1521f3e 100644
--- a/v14/preference/lint-baseline.xml
+++ b/v14/preference/lint-baseline.xml
@@ -1,42 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
-
-    <issue
-        id="MissingPermission"
-        message="Missing permissions required by LocationManager.getLastKnownLocation: android.permission.ACCESS_COARSE_LOCATION or android.permission.ACCESS_FINE_LOCATION"
-        errorLine1="                    return mLocationManager.getLastKnownLocation(provider);"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/app/TwilightManager.java"
-            line="128"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="MissingSuperCall"
-        message="Overriding method should call `super.draw`"
-        errorLine1="    public void draw(Canvas canvas) {"
-        errorLine2="                ~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewStubCompat.java"
-            line="151"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="DuplicateIds"
-        message="Duplicate id `@+id/image`, already defined earlier in this layout"
-        errorLine1="        &lt;ImageView android:id=&quot;@+id/image&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="62"
-            column="20"/>
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="40"
-            column="20"/>
-    </issue>
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="ResourceType"
@@ -50,50 +13,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="                    final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                            ~~~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="347"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="ResourceType"
-        message="Expected resource of type layout"
-        errorLine1="            parser = mContext.getResources().getLayout(menuRes);"
-        errorLine2="                                                       ~~~~~~~">
-        <location
-            file="src/android/support/v7/view/SupportMenuInflater.java"
-            line="123"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="868"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildWidth, MeasureSpec.EXACTLY),"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="1286"
-            column="61"/>
-    </issue>
-
-    <issue
         id="Suspicious0dp"
         message="Suspicious size: this will make the view invisible, should be used with `layout_weight`"
         errorLine1="        android:layout_width=&quot;0dp&quot;"
@@ -149,116 +68,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="62"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="            Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="67"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set content description via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="87"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                        Log.d(TAG, &quot;[loadDrawableFromDelegates] Skipping drawable: &quot;"
-        errorLine2="                              ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="315"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.i(TAG, &quot;[loadDrawableFromDelegates] Returning cached drawable: &quot; +"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="337"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                            Log.i(TAG, &quot;[loadDrawableFromDelegates] Saved drawable to cache: &quot; +"
-        errorLine2="                                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="372"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.e(TAG, &quot;Exception while inflating drawable&quot;, e);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="377"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                Log.d(TAG, &quot;[tintDrawableUsingColorFilter] Tinted &quot;"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="482"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="            Log.d(TAG, &quot;Mutated drawable is not the same instance as the input.&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="698"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
-        errorLine1="        return 0;"
-        errorLine2="               ~">
-        <location
-            file="src/android/support/v7/widget/ActionBarBackgroundDrawable.java"
-            line="59"
-            column="16"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
         message="Must be one or more of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
         errorLine1="                            + gravityToString(childGravity) + &quot; but this &quot; + TAG + &quot; already has a &quot;"
@@ -276,7 +85,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
@@ -287,7 +96,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
diff --git a/v17/leanback/lint-baseline.xml b/v17/leanback/lint-baseline.xml
index b373b5e..412bb63 100644
--- a/v17/leanback/lint-baseline.xml
+++ b/v17/leanback/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="WrongConstant"
diff --git a/v17/preference-leanback/lint-baseline.xml b/v17/preference-leanback/lint-baseline.xml
index 57cbf2b..bb2e6a5 100644
--- a/v17/preference-leanback/lint-baseline.xml
+++ b/v17/preference-leanback/lint-baseline.xml
@@ -1,42 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
-
-    <issue
-        id="MissingPermission"
-        message="Missing permissions required by LocationManager.getLastKnownLocation: android.permission.ACCESS_COARSE_LOCATION or android.permission.ACCESS_FINE_LOCATION"
-        errorLine1="                    return mLocationManager.getLastKnownLocation(provider);"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/app/TwilightManager.java"
-            line="128"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="MissingSuperCall"
-        message="Overriding method should call `super.draw`"
-        errorLine1="    public void draw(Canvas canvas) {"
-        errorLine2="                ~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewStubCompat.java"
-            line="151"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="DuplicateIds"
-        message="Duplicate id `@+id/image`, already defined earlier in this layout"
-        errorLine1="        &lt;ImageView android:id=&quot;@+id/image&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="62"
-            column="20"/>
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="40"
-            column="20"/>
-    </issue>
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="ResourceType"
@@ -50,50 +13,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="                    final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                            ~~~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="347"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="ResourceType"
-        message="Expected resource of type layout"
-        errorLine1="            parser = mContext.getResources().getLayout(menuRes);"
-        errorLine2="                                                       ~~~~~~~">
-        <location
-            file="src/android/support/v7/view/SupportMenuInflater.java"
-            line="123"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="868"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildWidth, MeasureSpec.EXACTLY),"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="1286"
-            column="61"/>
-    </issue>
-
-    <issue
         id="Suspicious0dp"
         message="Suspicious size: this will make the view invisible, should be used with `layout_weight`"
         errorLine1="        &lt;Space android:layout_width=&quot;0dp&quot; android:layout_height=&quot;@dimen/lb_preference_item_text_space_top&quot; />"
@@ -193,116 +112,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="62"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="            Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="67"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set content description via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="87"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                        Log.d(TAG, &quot;[loadDrawableFromDelegates] Skipping drawable: &quot;"
-        errorLine2="                              ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="315"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.i(TAG, &quot;[loadDrawableFromDelegates] Returning cached drawable: &quot; +"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="337"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                            Log.i(TAG, &quot;[loadDrawableFromDelegates] Saved drawable to cache: &quot; +"
-        errorLine2="                                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="372"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.e(TAG, &quot;Exception while inflating drawable&quot;, e);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="377"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                Log.d(TAG, &quot;[tintDrawableUsingColorFilter] Tinted &quot;"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="482"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="            Log.d(TAG, &quot;Mutated drawable is not the same instance as the input.&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="698"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
-        errorLine1="        return 0;"
-        errorLine2="               ~">
-        <location
-            file="src/android/support/v7/widget/ActionBarBackgroundDrawable.java"
-            line="59"
-            column="16"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
         message="Must be one or more of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
         errorLine1="                            + gravityToString(childGravity) + &quot; but this &quot; + TAG + &quot; already has a &quot;"
@@ -320,7 +129,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
@@ -331,7 +140,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
diff --git a/v4/lint-baseline.xml b/v4/lint-baseline.xml
index b373b5e..412bb63 100644
--- a/v4/lint-baseline.xml
+++ b/v4/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="WrongConstant"
diff --git a/v7/appcompat/lint-baseline.xml b/v7/appcompat/lint-baseline.xml
index d533bd0..0618190 100644
--- a/v7/appcompat/lint-baseline.xml
+++ b/v7/appcompat/lint-baseline.xml
@@ -1,42 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
-
-    <issue
-        id="MissingPermission"
-        message="Missing permissions required by LocationManager.getLastKnownLocation: android.permission.ACCESS_COARSE_LOCATION or android.permission.ACCESS_FINE_LOCATION"
-        errorLine1="                    return mLocationManager.getLastKnownLocation(provider);"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/app/TwilightManager.java"
-            line="128"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="MissingSuperCall"
-        message="Overriding method should call `super.draw`"
-        errorLine1="    public void draw(Canvas canvas) {"
-        errorLine2="                ~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewStubCompat.java"
-            line="151"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="DuplicateIds"
-        message="Duplicate id `@+id/image`, already defined earlier in this layout"
-        errorLine1="        &lt;ImageView android:id=&quot;@+id/image&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="62"
-            column="20"/>
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="40"
-            column="20"/>
-    </issue>
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="ResourceType"
@@ -50,160 +13,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="                    final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                            ~~~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="347"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="ResourceType"
-        message="Expected resource of type layout"
-        errorLine1="            parser = mContext.getResources().getLayout(menuRes);"
-        errorLine2="                                                       ~~~~~~~">
-        <location
-            file="src/android/support/v7/view/SupportMenuInflater.java"
-            line="123"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="868"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildWidth, MeasureSpec.EXACTLY),"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="1286"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="62"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="            Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="67"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set content description via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="87"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                        Log.d(TAG, &quot;[loadDrawableFromDelegates] Skipping drawable: &quot;"
-        errorLine2="                              ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="315"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.i(TAG, &quot;[loadDrawableFromDelegates] Returning cached drawable: &quot; +"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="337"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                            Log.i(TAG, &quot;[loadDrawableFromDelegates] Saved drawable to cache: &quot; +"
-        errorLine2="                                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="372"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.e(TAG, &quot;Exception while inflating drawable&quot;, e);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="377"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                Log.d(TAG, &quot;[tintDrawableUsingColorFilter] Tinted &quot;"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="482"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="            Log.d(TAG, &quot;Mutated drawable is not the same instance as the input.&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="698"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
-        errorLine1="        return 0;"
-        errorLine2="               ~">
-        <location
-            file="src/android/support/v7/widget/ActionBarBackgroundDrawable.java"
-            line="59"
-            column="16"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
         message="Must be one or more of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
         errorLine1="                            + gravityToString(childGravity) + &quot; but this &quot; + TAG + &quot; already has a &quot;"
@@ -221,7 +30,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
@@ -232,7 +41,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
diff --git a/v7/appcompat/res/layout/abc_activity_chooser_view.xml b/v7/appcompat/res/layout/abc_activity_chooser_view.xml
index 0100c23..7e2da5c 100644
--- a/v7/appcompat/res/layout/abc_activity_chooser_view.xml
+++ b/v7/appcompat/res/layout/abc_activity_chooser_view.xml
@@ -59,7 +59,7 @@
         android:paddingLeft="12dip"
         android:paddingRight="12dip">
 
-        <ImageView android:id="@+id/image"
+        <ImageView android:id="@id/image"
             android:layout_width="32dip"
             android:layout_height="32dip"
             android:layout_gravity="center"
diff --git a/v7/appcompat/src/android/support/v7/app/ActionBar.java b/v7/appcompat/src/android/support/v7/app/ActionBar.java
index c619596..5c40908 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBar.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBar.java
@@ -154,7 +154,7 @@
      * @see #setDisplayOptions(int)
      * @see #setDisplayOptions(int, int)
      */
-    public static final int DISPLAY_USE_LOGO = 0x1;
+    public static final int DISPLAY_USE_LOGO = android.app.ActionBar.DISPLAY_USE_LOGO;
 
     /**
      * Show 'home' elements in this action bar, leaving more space for other
@@ -163,7 +163,7 @@
      * @see #setDisplayOptions(int)
      * @see #setDisplayOptions(int, int)
      */
-    public static final int DISPLAY_SHOW_HOME = 0x2;
+    public static final int DISPLAY_SHOW_HOME = android.app.ActionBar.DISPLAY_SHOW_HOME;
 
     /**
      * Display the 'home' element such that it appears as an 'up' affordance.
@@ -178,7 +178,7 @@
      * @see #setDisplayOptions(int)
      * @see #setDisplayOptions(int, int)
      */
-    public static final int DISPLAY_HOME_AS_UP = 0x4;
+    public static final int DISPLAY_HOME_AS_UP = android.app.ActionBar.DISPLAY_HOME_AS_UP;
 
     /**
      * Show the activity title and subtitle, if present.
@@ -190,7 +190,7 @@
      * @see #setDisplayOptions(int)
      * @see #setDisplayOptions(int, int)
      */
-    public static final int DISPLAY_SHOW_TITLE = 0x8;
+    public static final int DISPLAY_SHOW_TITLE = android.app.ActionBar.DISPLAY_SHOW_TITLE;
 
     /**
      * Show the custom view if one has been set.
@@ -199,7 +199,7 @@
      * @see #setDisplayOptions(int)
      * @see #setDisplayOptions(int, int)
      */
-    public static final int DISPLAY_SHOW_CUSTOM = 0x10;
+    public static final int DISPLAY_SHOW_CUSTOM = android.app.ActionBar.DISPLAY_SHOW_CUSTOM;
 
     /**
      * Set the action bar into custom navigation mode, supplying a view
diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java b/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java
index 92cf866..b2fc9fb 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java
@@ -42,7 +42,7 @@
  */
 @RequiresApi(11)
 class ActionBarDrawerToggleHoneycomb {
-    private static final String TAG = "ActionBarDrawerToggleHoneycomb";
+    private static final String TAG = "ActionBarDrawerToggleHC";
 
     private static final int[] THEME_ATTRS = new int[] {
             R.attr.homeAsUpIndicator
diff --git a/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java b/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
index 79059c7..a38b12d 100644
--- a/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
+++ b/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
@@ -22,7 +22,6 @@
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.view.WindowCallbackWrapper;
-import android.support.v7.view.menu.ListMenuPresenter;
 import android.support.v7.view.menu.MenuBuilder;
 import android.support.v7.view.menu.MenuPresenter;
 import android.support.v7.widget.DecorToolbar;
@@ -49,8 +48,6 @@
     private boolean mLastMenuVisibility;
     private ArrayList<OnMenuVisibilityListener> mMenuVisibilityListeners = new ArrayList<>();
 
-    private ListMenuPresenter mListMenuPresenter;
-
     private final Runnable mMenuInvalidator = new Runnable() {
         @Override
         public void run() {
diff --git a/v7/appcompat/src/android/support/v7/app/TwilightManager.java b/v7/appcompat/src/android/support/v7/app/TwilightManager.java
index 61bb136..e574e1a 100644
--- a/v7/appcompat/src/android/support/v7/app/TwilightManager.java
+++ b/v7/appcompat/src/android/support/v7/app/TwilightManager.java
@@ -16,11 +16,16 @@
 
 package android.support.v7.app;
 
+import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+
 import android.Manifest;
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.location.Location;
 import android.location.LocationManager;
 import android.support.annotation.NonNull;
+import android.support.annotation.RequiresPermission;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.content.PermissionChecker;
 import android.text.format.DateUtils;
@@ -96,6 +101,7 @@
         return hour < SUNRISE || hour >= SUNSET;
     }
 
+    @SuppressLint("MissingPermission") // permissions are checked for the needed call.
     private Location getLastKnownLocation() {
         Location coarseLoc = null;
         Location fineLoc = null;
@@ -121,21 +127,20 @@
         }
     }
 
+    @RequiresPermission(anyOf = {ACCESS_COARSE_LOCATION, ACCESS_FINE_LOCATION})
     private Location getLastKnownLocationForProvider(String provider) {
-        if (mLocationManager != null) {
-            try {
-                if (mLocationManager.isProviderEnabled(provider)) {
-                    return mLocationManager.getLastKnownLocation(provider);
-                }
-            } catch (Exception e) {
-                Log.d(TAG, "Failed to get last known location", e);
+        try {
+            if (mLocationManager.isProviderEnabled(provider)) {
+                return mLocationManager.getLastKnownLocation(provider);
             }
+        } catch (Exception e) {
+            Log.d(TAG, "Failed to get last known location", e);
         }
         return null;
     }
 
     private boolean isStateValid() {
-        return mTwilightState != null && mTwilightState.nextUpdate > System.currentTimeMillis();
+        return mTwilightState.nextUpdate > System.currentTimeMillis();
     }
 
     private void updateState(@NonNull Location location) {
diff --git a/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java b/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java
index 0cc5722..0522361 100644
--- a/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java
+++ b/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java
@@ -25,6 +25,7 @@
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
 import android.graphics.PorterDuff;
+import android.support.annotation.LayoutRes;
 import android.support.annotation.RestrictTo;
 import android.support.v4.internal.view.SupportMenu;
 import android.support.v4.view.ActionProvider;
@@ -111,7 +112,7 @@
      *            added to this Menu.
      */
     @Override
-    public void inflate(int menuRes, Menu menu) {
+    public void inflate(@LayoutRes int menuRes, Menu menu) {
         // If we're not dealing with a SupportMenu instance, let super handle
         if (!(menu instanceof SupportMenu)) {
             super.inflate(menuRes, menu);
diff --git a/v7/appcompat/src/android/support/v7/widget/ActionBarBackgroundDrawable.java b/v7/appcompat/src/android/support/v7/widget/ActionBarBackgroundDrawable.java
index 5e86497..5394c76 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActionBarBackgroundDrawable.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActionBarBackgroundDrawable.java
@@ -18,6 +18,7 @@
 
 import android.graphics.Canvas;
 import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.RequiresApi;
 
@@ -56,7 +57,7 @@
 
     @Override
     public int getOpacity() {
-        return 0;
+        return PixelFormat.UNKNOWN;
     }
 
 }
diff --git a/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java b/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
index 5165574..61e5cc9 100644
--- a/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
+++ b/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
@@ -23,6 +23,7 @@
 import static android.support.v7.widget.ThemeUtils.getThemeAttrColor;
 import static android.support.v7.widget.ThemeUtils.getThemeAttrColorStateList;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
@@ -70,7 +71,7 @@
                 @NonNull AttributeSet attrs, @Nullable Resources.Theme theme);
     }
 
-    private static final String TAG = "AppCompatDrawableManager";
+    private static final String TAG = "AppCompatDrawableManag";
     private static final boolean DEBUG = false;
     private static final PorterDuff.Mode DEFAULT_MODE = PorterDuff.Mode.SRC_IN;
     private static final String SKIP_DRAWABLE_TAG = "appcompat_skip_skip";
@@ -344,7 +345,7 @@
             if (tv.string != null && tv.string.toString().endsWith(".xml")) {
                 // If the resource is an XML file, let's try and parse it
                 try {
-                    final XmlPullParser parser = res.getXml(resId);
+                    @SuppressLint("ResourceType") final XmlPullParser parser = res.getXml(resId);
                     final AttributeSet attrs = Xml.asAttributeSet(parser);
                     int type;
                     while ((type = parser.next()) != XmlPullParser.START_TAG &&
diff --git a/v7/appcompat/src/android/support/v7/widget/LinearLayoutCompat.java b/v7/appcompat/src/android/support/v7/widget/LinearLayoutCompat.java
index bb400f1..7c02e4b 100644
--- a/v7/appcompat/src/android/support/v7/widget/LinearLayoutCompat.java
+++ b/v7/appcompat/src/android/support/v7/widget/LinearLayoutCompat.java
@@ -38,7 +38,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
-
 /**
  * A Layout that arranges its children in a single column or a single row. The direction of
  * the row can be set by calling {@link #setOrientation(int) setOrientation()}.
@@ -610,7 +609,7 @@
         final int baselineChildIndex = mBaselineAlignedChildIndex;
         final boolean useLargestChild = mUseLargestChild;
 
-        int largestChildHeight = Integer.MIN_VALUE;
+        int largestChildHeight = 0;
 
         // See how tall everyone is. Also remember max width.
         for (int i = 0; i < count; ++i) {
@@ -956,7 +955,7 @@
 
         final boolean isExactly = widthMode == MeasureSpec.EXACTLY;
 
-        int largestChildWidth = Integer.MIN_VALUE;
+        int largestChildWidth = 0;
 
         // See how wide everyone is. Also remember max height.
         for (int i = 0; i < count; ++i) {
diff --git a/v7/appcompat/src/android/support/v7/widget/ViewStubCompat.java b/v7/appcompat/src/android/support/v7/widget/ViewStubCompat.java
index 6319eac..4512466 100644
--- a/v7/appcompat/src/android/support/v7/widget/ViewStubCompat.java
+++ b/v7/appcompat/src/android/support/v7/widget/ViewStubCompat.java
@@ -18,6 +18,7 @@
 
 import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
@@ -147,6 +148,7 @@
         setMeasuredDimension(0, 0);
     }
 
+    @SuppressLint("MissingSuperCall") // Intentionally not calling super method.
     @Override
     public void draw(Canvas canvas) {
     }
diff --git a/v7/cardview/lint-baseline.xml b/v7/cardview/lint-baseline.xml
index fb44511..8eec225 100644
--- a/v7/cardview/lint-baseline.xml
+++ b/v7/cardview/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/v7/gridlayout/lint-baseline.xml b/v7/gridlayout/lint-baseline.xml
index b373b5e..412bb63 100644
--- a/v7/gridlayout/lint-baseline.xml
+++ b/v7/gridlayout/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="WrongConstant"
diff --git a/v7/mediarouter/lint-baseline.xml b/v7/mediarouter/lint-baseline.xml
index 4e530f6..daceff2 100644
--- a/v7/mediarouter/lint-baseline.xml
+++ b/v7/mediarouter/lint-baseline.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
-
-    <issue
-        id="MissingPermission"
-        message="Missing permissions required by LocationManager.getLastKnownLocation: android.permission.ACCESS_COARSE_LOCATION or android.permission.ACCESS_FINE_LOCATION"
-        errorLine1="                    return mLocationManager.getLastKnownLocation(provider);"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/app/TwilightManager.java"
-            line="128"
-            column="28"/>
-    </issue>
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="MissingSuperCall"
@@ -24,32 +13,6 @@
     </issue>
 
     <issue
-        id="MissingSuperCall"
-        message="Overriding method should call `super.draw`"
-        errorLine1="    public void draw(Canvas canvas) {"
-        errorLine2="                ~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewStubCompat.java"
-            line="151"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="DuplicateIds"
-        message="Duplicate id `@+id/image`, already defined earlier in this layout"
-        errorLine1="        &lt;ImageView android:id=&quot;@+id/image&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="62"
-            column="20"/>
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="40"
-            column="20"/>
-    </issue>
-
-    <issue
         id="ResourceType"
         message="Expected resource of type anim"
         errorLine1="            parser = resources.getAnimation(id);"
@@ -61,149 +24,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="                    final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                            ~~~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="347"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="ResourceType"
-        message="Expected resource of type layout"
-        errorLine1="            parser = mContext.getResources().getLayout(menuRes);"
-        errorLine2="                                                       ~~~~~~~">
-        <location
-            file="src/android/support/v7/view/SupportMenuInflater.java"
-            line="123"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="868"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildWidth, MeasureSpec.EXACTLY),"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="1286"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="62"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="            Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="67"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set content description via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="87"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                        Log.d(TAG, &quot;[loadDrawableFromDelegates] Skipping drawable: &quot;"
-        errorLine2="                              ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="315"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.i(TAG, &quot;[loadDrawableFromDelegates] Returning cached drawable: &quot; +"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="337"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                            Log.i(TAG, &quot;[loadDrawableFromDelegates] Saved drawable to cache: &quot; +"
-        errorLine2="                                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="372"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.e(TAG, &quot;Exception while inflating drawable&quot;, e);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="377"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                Log.d(TAG, &quot;[tintDrawableUsingColorFilter] Tinted &quot;"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="482"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="            Log.d(TAG, &quot;Mutated drawable is not the same instance as the input.&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="698"
-            column="19"/>
-    </issue>
-
-    <issue
         id="LongLogTag"
         message="The logging tag can be at most 23 characters, was 24 (MediaRouteActionProvider)"
         errorLine1="            Log.e(TAG, &quot;onCreateActionView: this ActionProvider is already associated &quot; +"
@@ -216,17 +36,6 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
-        errorLine1="        return 0;"
-        errorLine2="               ~">
-        <location
-            file="src/android/support/v7/widget/ActionBarBackgroundDrawable.java"
-            line="59"
-            column="16"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
         message="Must be one or more of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
         errorLine1="                            + gravityToString(childGravity) + &quot; but this &quot; + TAG + &quot; already has a &quot;"
         errorLine2="                                              ~~~~~~~~~~~~">
@@ -243,7 +52,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
@@ -254,7 +63,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
diff --git a/v7/palette/lint-baseline.xml b/v7/palette/lint-baseline.xml
index fb44511..8eec225 100644
--- a/v7/palette/lint-baseline.xml
+++ b/v7/palette/lint-baseline.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
 </issues>
diff --git a/v7/preference/lint-baseline.xml b/v7/preference/lint-baseline.xml
index 5f43434..becfe2e3 100644
--- a/v7/preference/lint-baseline.xml
+++ b/v7/preference/lint-baseline.xml
@@ -1,42 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
-
-    <issue
-        id="MissingPermission"
-        message="Missing permissions required by LocationManager.getLastKnownLocation: android.permission.ACCESS_COARSE_LOCATION or android.permission.ACCESS_FINE_LOCATION"
-        errorLine1="                    return mLocationManager.getLastKnownLocation(provider);"
-        errorLine2="                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/app/TwilightManager.java"
-            line="128"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="MissingSuperCall"
-        message="Overriding method should call `super.draw`"
-        errorLine1="    public void draw(Canvas canvas) {"
-        errorLine2="                ~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewStubCompat.java"
-            line="151"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="DuplicateIds"
-        message="Duplicate id `@+id/image`, already defined earlier in this layout"
-        errorLine1="        &lt;ImageView android:id=&quot;@+id/image&quot;"
-        errorLine2="                   ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="62"
-            column="20"/>
-        <location
-            file="res/layout/abc_activity_chooser_view.xml"
-            line="40"
-            column="20"/>
-    </issue>
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="ResourceType"
@@ -50,50 +13,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="                    final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                            ~~~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="347"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="ResourceType"
-        message="Expected resource of type layout"
-        errorLine1="            parser = mContext.getResources().getLayout(menuRes);"
-        errorLine2="                                                       ~~~~~~~">
-        <location
-            file="src/android/support/v7/view/SupportMenuInflater.java"
-            line="123"
-            column="56"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="868"
-            column="61"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -2147483648)"
-        errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildWidth, MeasureSpec.EXACTLY),"
-        errorLine2="                                                            ~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/LinearLayoutCompat.java"
-            line="1286"
-            column="61"/>
-    </issue>
-
-    <issue
         id="Suspicious0dp"
         message="Suspicious size: this will make the view invisible, should be used with `layout_weight`"
         errorLine1="        android:layout_width=&quot;0dp&quot;"
@@ -116,116 +35,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="62"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="            Log.w(TAG, &quot;Couldn&apos;t set home-as-up indicator&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="67"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 30 (ActionBarDrawerToggleHoneycomb)"
-        errorLine1="                Log.w(TAG, &quot;Couldn&apos;t set content description via JB-MR2 API&quot;, e);"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/app/ActionBarDrawerToggleHoneycomb.java"
-            line="87"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                        Log.d(TAG, &quot;[loadDrawableFromDelegates] Skipping drawable: &quot;"
-        errorLine2="                              ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="315"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.i(TAG, &quot;[loadDrawableFromDelegates] Returning cached drawable: &quot; +"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="337"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                            Log.i(TAG, &quot;[loadDrawableFromDelegates] Saved drawable to cache: &quot; +"
-        errorLine2="                                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="372"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                    Log.e(TAG, &quot;Exception while inflating drawable&quot;, e);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="377"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="                Log.d(TAG, &quot;[tintDrawableUsingColorFilter] Tinted &quot;"
-        errorLine2="                      ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="482"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (AppCompatDrawableManager)"
-        errorLine1="            Log.d(TAG, &quot;Mutated drawable is not the same instance as the input.&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/AppCompatDrawableManager.java"
-            line="698"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
-        errorLine1="        return 0;"
-        errorLine2="               ~">
-        <location
-            file="src/android/support/v7/widget/ActionBarBackgroundDrawable.java"
-            line="59"
-            column="16"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
         message="Must be one or more of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
         errorLine1="                            + gravityToString(childGravity) + &quot; but this &quot; + TAG + &quot; already has a &quot;"
@@ -243,7 +52,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
@@ -254,7 +63,7 @@
         errorLine2="                                   ~~~~~~~~~~">
         <location
             file="src/android/support/v7/app/ToolbarActionBar.java"
-            line="254"
+            line="251"
             column="36"/>
     </issue>
 
diff --git a/v7/recyclerview/lint-baseline.xml b/v7/recyclerview/lint-baseline.xml
index b373b5e..412bb63 100644
--- a/v7/recyclerview/lint-baseline.xml
+++ b/v7/recyclerview/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="WrongConstant"
diff --git a/wear/lint-baseline.xml b/wear/lint-baseline.xml
index 452f016..4fd0b56 100644
--- a/wear/lint-baseline.xml
+++ b/wear/lint-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="4" by="lint 3.0.0-alpha5">
+<issues format="4" by="lint 3.0.0-alpha6">
 
     <issue
         id="DuplicateIds"