Fix an assortment of lint warnings.

Test: ./gradlew lintRelease
Change-Id: I3f05f4bcfbd7f755be61a9a98b6e5a11c98ab3cd
diff --git a/core-ui/java/android/support/v4/widget/DrawerLayout.java b/core-ui/java/android/support/v4/widget/DrawerLayout.java
index 3b3a781..c7b40e9 100644
--- a/core-ui/java/android/support/v4/widget/DrawerLayout.java
+++ b/core-ui/java/android/support/v4/widget/DrawerLayout.java
@@ -148,7 +148,8 @@
      */
     public static final int LOCK_MODE_UNDEFINED = 3;
 
-    @IntDef({Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END})
+    @IntDef(value = {Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END},
+            flag = true)
     @Retention(RetentionPolicy.SOURCE)
     private @interface EdgeGravity {}
 
diff --git a/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java b/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
index c949cbb..e3f2462 100644
--- a/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
+++ b/core-ui/java/android/support/v4/widget/SlidingPaneLayout.java
@@ -477,7 +477,7 @@
         }
 
         int layoutHeight = 0;
-        int maxLayoutHeight = -1;
+        int maxLayoutHeight = 0;
         switch (heightMode) {
             case MeasureSpec.EXACTLY:
                 layoutHeight = maxLayoutHeight = heightSize - getPaddingTop() - getPaddingBottom();
diff --git a/core-ui/lint-baseline.xml b/core-ui/lint-baseline.xml
index 1c675b0..493c8c5 100644
--- a/core-ui/lint-baseline.xml
+++ b/core-ui/lint-baseline.xml
@@ -2,102 +2,14 @@
 <issues format="4" by="lint 2.4.0-alpha6">
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
 </issues>
diff --git a/core-utils/java/android/support/v4/content/WakefulBroadcastReceiver.java b/core-utils/java/android/support/v4/content/WakefulBroadcastReceiver.java
index b960939..b0cd653 100644
--- a/core-utils/java/android/support/v4/content/WakefulBroadcastReceiver.java
+++ b/core-utils/java/android/support/v4/content/WakefulBroadcastReceiver.java
@@ -70,8 +70,7 @@
 public abstract class WakefulBroadcastReceiver extends BroadcastReceiver {
     private static final String EXTRA_WAKE_LOCK_ID = "android.support.content.wakelockid";
 
-    private static final SparseArray<PowerManager.WakeLock> mActiveWakeLocks
-            = new SparseArray<PowerManager.WakeLock>();
+    private static final SparseArray<PowerManager.WakeLock> sActiveWakeLocks = new SparseArray<>();
     private static int mNextId = 1;
 
     /**
@@ -89,7 +88,7 @@
      * Context.startService}.
      */
     public static ComponentName startWakefulService(Context context, Intent intent) {
-        synchronized (mActiveWakeLocks) {
+        synchronized (sActiveWakeLocks) {
             int id = mNextId;
             mNextId++;
             if (mNextId <= 0) {
@@ -106,8 +105,8 @@
             PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
                     "wake:" + comp.flattenToShortString());
             wl.setReferenceCounted(false);
-            wl.acquire(60*1000);
-            mActiveWakeLocks.put(id, wl);
+            wl.acquire(60 * 1000);
+            sActiveWakeLocks.put(id, wl);
             return comp;
         }
     }
@@ -125,11 +124,11 @@
         if (id == 0) {
             return false;
         }
-        synchronized (mActiveWakeLocks) {
-            PowerManager.WakeLock wl = mActiveWakeLocks.get(id);
+        synchronized (sActiveWakeLocks) {
+            PowerManager.WakeLock wl = sActiveWakeLocks.get(id);
             if (wl != null) {
                 wl.release();
-                mActiveWakeLocks.remove(id);
+                sActiveWakeLocks.remove(id);
                 return true;
             }
             // We return true whether or not we actually found the wake lock
@@ -138,7 +137,7 @@
             // We just log a warning here if there is no wake lock found, which could
             // happen for example if this function is called twice on the same
             // intent or the process is killed and restarted before processing the intent.
-            Log.w("WakefulBroadcastReceiver", "No active wake lock id #" + id);
+            Log.w("WakefulBroadcastReceiv.", "No active wake lock id #" + id);
             return true;
         }
     }
diff --git a/core-utils/java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java b/core-utils/java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java
index 5efc74b..5e144c7 100644
--- a/core-utils/java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java
+++ b/core-utils/java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java
@@ -31,7 +31,7 @@
  * either from Bitmaps directly, or from streams and files.
  */
 public final class RoundedBitmapDrawableFactory {
-    private static final String TAG = "RoundedBitmapDrawableFactory";
+    private static final String TAG = "RoundedBitmapDrawableFa";
 
     private static class DefaultRoundedBitmapDrawable extends RoundedBitmapDrawable {
         DefaultRoundedBitmapDrawable(Resources res, Bitmap bitmap) {
diff --git a/core-utils/lint-baseline.xml b/core-utils/lint-baseline.xml
index d75d39e..172bbf6 100644
--- a/core-utils/lint-baseline.xml
+++ b/core-utils/lint-baseline.xml
@@ -1,37 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <issues format="4" by="lint 2.4.0-alpha6">
 
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
 </issues>
diff --git a/design/lint-baseline.xml b/design/lint-baseline.xml
index 7ece01b..6cd8289 100644
--- a/design/lint-baseline.xml
+++ b/design/lint-baseline.xml
@@ -94,17 +94,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="            final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                    ~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="557"
-            column="53"/>
-    </issue>
-
-    <issue
         id="Range"
         message="Value must be ≥ 0 (was -2147483648)"
         errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
@@ -127,72 +116,6 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </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);"
@@ -292,171 +215,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;found saved state: &quot; + mPendingSavedState);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="783"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;Deciding anchor info from fresh state&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="828"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;invalid saved state class&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1187"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;saved state:\n&quot; + state);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1236"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;FILLING targetLine: &quot; + targetLine + &quot;,&quot;"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1559"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;assigned &quot; + currentSpan.mIndex + &quot; for &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1580"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;using &quot; + spanIndex + &quot; for pos &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1584"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;asked &quot; + dt + &quot; scrolled&quot; + totalScroll);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2153"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;Unknown focus request:&quot; + focusDirection);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2385"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="AppCompatCustomView"
         message="This custom view should extend `android.support.v7.widget.AppCompatAutoCompleteTextView` instead"
         errorLine1="public class AppCompatAutoCompleteTextView extends AutoCompleteTextView implements"
@@ -633,21 +391,6 @@
     </issue>
 
     <issue
-        id="UniqueConstants"
-        message="Constants `FLAG_CVE_EQ_PVE` and `FLAG_CVE_EQ_PVE` specify the same exact value (8192); this is usually a cut &amp; paste or merge error"
-        errorLine1="            FLAG_CVE_EQ_PVE, FLAG_CVE_EQ_PVE, FLAG_CVE_LT_PVE"
-        errorLine2="                             ~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="30"/>
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="13"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
         message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
         errorLine1="        return 0;"
@@ -660,35 +403,13 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
     <issue
@@ -713,15 +434,4 @@
             column="36"/>
     </issue>
 
-    <issue
-        id="WrongConstant"
-        message="Must be one of: View.LAYOUT_DIRECTION_LTR, View.LAYOUT_DIRECTION_RTL"
-        errorLine1="            return isAutoMirrored() &amp;&amp; getLayoutDirection() == LayoutDirection.RTL;"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="821"
-            column="64"/>
-    </issue>
-
 </issues>
diff --git a/dynamic-animation/lint-baseline.xml b/dynamic-animation/lint-baseline.xml
index d75d39e..172bbf6 100644
--- a/dynamic-animation/lint-baseline.xml
+++ b/dynamic-animation/lint-baseline.xml
@@ -1,37 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <issues format="4" by="lint 2.4.0-alpha6">
 
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
 </issues>
diff --git a/emoji/appcompat/lint-baseline.xml b/emoji/appcompat/lint-baseline.xml
index 91d58da..3b6c11d 100644
--- a/emoji/appcompat/lint-baseline.xml
+++ b/emoji/appcompat/lint-baseline.xml
@@ -94,17 +94,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="            final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                    ~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="557"
-            column="53"/>
-    </issue>
-
-    <issue
         id="Range"
         message="Value must be ≥ 0 (was -2147483648)"
         errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
@@ -127,72 +116,6 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </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);"
@@ -292,72 +215,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="AppCompatCustomView"
         message="This custom view should extend `android.support.v7.widget.AppCompatAutoCompleteTextView` instead"
         errorLine1="public class AppCompatAutoCompleteTextView extends AutoCompleteTextView implements"
@@ -579,35 +436,13 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
     <issue
@@ -632,15 +467,4 @@
             column="36"/>
     </issue>
 
-    <issue
-        id="WrongConstant"
-        message="Must be one of: View.LAYOUT_DIRECTION_LTR, View.LAYOUT_DIRECTION_RTL"
-        errorLine1="            return isAutoMirrored() &amp;&amp; getLayoutDirection() == LayoutDirection.RTL;"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="821"
-            column="64"/>
-    </issue>
-
 </issues>
diff --git a/fragment/java/android/support/v4/app/FragmentStatePagerAdapter.java b/fragment/java/android/support/v4/app/FragmentStatePagerAdapter.java
index 7aa3d20..fc27c4f 100644
--- a/fragment/java/android/support/v4/app/FragmentStatePagerAdapter.java
+++ b/fragment/java/android/support/v4/app/FragmentStatePagerAdapter.java
@@ -62,7 +62,7 @@
  *      complete}
  */
 public abstract class FragmentStatePagerAdapter extends PagerAdapter {
-    private static final String TAG = "FragmentStatePagerAdapter";
+    private static final String TAG = "FragmentStatePagerAdapt";
     private static final boolean DEBUG = false;
 
     private final FragmentManager mFragmentManager;
diff --git a/fragment/lint-baseline.xml b/fragment/lint-baseline.xml
index 2a79d28..4d3d334 100644
--- a/fragment/lint-baseline.xml
+++ b/fragment/lint-baseline.xml
@@ -24,168 +24,14 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
 </issues>
diff --git a/graphics/drawable/animated/lint-baseline.xml b/graphics/drawable/animated/lint-baseline.xml
index a3f6f77..42fb119 100644
--- a/graphics/drawable/animated/lint-baseline.xml
+++ b/graphics/drawable/animated/lint-baseline.xml
@@ -13,124 +13,14 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="            final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                    ~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="557"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: View.LAYOUT_DIRECTION_LTR, View.LAYOUT_DIRECTION_RTL"
-        errorLine1="            return isAutoMirrored() &amp;&amp; getLayoutDirection() == LayoutDirection.RTL;"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="821"
-            column="64"/>
+            line="1075"
+            column="47"/>
     </issue>
 
 </issues>
diff --git a/graphics/drawable/static/lint-baseline.xml b/graphics/drawable/static/lint-baseline.xml
index 2809a1e..172bbf6 100644
--- a/graphics/drawable/static/lint-baseline.xml
+++ b/graphics/drawable/static/lint-baseline.xml
@@ -1,26 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <issues format="4" by="lint 2.4.0-alpha6">
 
-    <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="            final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                    ~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="557"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: View.LAYOUT_DIRECTION_LTR, View.LAYOUT_DIRECTION_RTL"
-        errorLine1="            return isAutoMirrored() &amp;&amp; getLayoutDirection() == LayoutDirection.RTL;"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="821"
-            column="64"/>
-    </issue>
-
 </issues>
diff --git a/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java b/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java
index f260562..2c7ae41 100644
--- a/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java
+++ b/graphics/drawable/static/src/android/support/graphics/drawable/VectorDrawableCompat.java
@@ -16,6 +16,7 @@
 
 import static android.support.annotation.RestrictTo.Scope.LIBRARY_GROUP;
 
+import android.annotation.SuppressLint;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.content.res.Resources.Theme;
@@ -554,7 +555,7 @@
         }
 
         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/recommendation/lint-baseline.xml b/recommendation/lint-baseline.xml
index 2a79d28..4d3d334 100644
--- a/recommendation/lint-baseline.xml
+++ b/recommendation/lint-baseline.xml
@@ -24,168 +24,14 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
 </issues>
diff --git a/settings.gradle b/settings.gradle
index dd3db92..ffc34ee 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -94,9 +94,6 @@
 include ':support-tv-provider'
 project(':support-tv-provider').projectDir = new File(rootDir, 'tv-provider')
 
-include ':support-instantvideo'
-project(':support-instantvideo').projectDir = new File(rootDir, 'instantvideo')
-
 include ':support-emoji'
 project(':support-emoji').projectDir = new File(rootDir, 'emoji/core')
 
diff --git a/transition/lint-baseline.xml b/transition/lint-baseline.xml
index 2a79d28..4d3d334 100644
--- a/transition/lint-baseline.xml
+++ b/transition/lint-baseline.xml
@@ -24,168 +24,14 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
 </issues>
diff --git a/v13/lint-baseline.xml b/v13/lint-baseline.xml
index 2a79d28..4d3d334 100644
--- a/v13/lint-baseline.xml
+++ b/v13/lint-baseline.xml
@@ -24,168 +24,14 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
 </issues>
diff --git a/v14/preference/lint-baseline.xml b/v14/preference/lint-baseline.xml
index 65f542a..adeb0d6 100644
--- a/v14/preference/lint-baseline.xml
+++ b/v14/preference/lint-baseline.xml
@@ -94,17 +94,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="            final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                    ~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="557"
-            column="53"/>
-    </issue>
-
-    <issue
         id="Range"
         message="Value must be ≥ 0 (was -2147483648)"
         errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
@@ -127,72 +116,6 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </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;"
@@ -347,171 +270,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;found saved state: &quot; + mPendingSavedState);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="783"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;Deciding anchor info from fresh state&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="828"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;invalid saved state class&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1187"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;saved state:\n&quot; + state);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1236"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;FILLING targetLine: &quot; + targetLine + &quot;,&quot;"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1559"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;assigned &quot; + currentSpan.mIndex + &quot; for &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1580"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;using &quot; + spanIndex + &quot; for pos &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1584"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;asked &quot; + dt + &quot; scrolled&quot; + totalScroll);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2153"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;Unknown focus request:&quot; + focusDirection);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2385"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="AppCompatCustomView"
         message="This custom view should extend `android.support.v7.widget.AppCompatAutoCompleteTextView` instead"
         errorLine1="public class AppCompatAutoCompleteTextView extends AutoCompleteTextView implements"
@@ -688,21 +446,6 @@
     </issue>
 
     <issue
-        id="UniqueConstants"
-        message="Constants `FLAG_CVE_EQ_PVE` and `FLAG_CVE_EQ_PVE` specify the same exact value (8192); this is usually a cut &amp; paste or merge error"
-        errorLine1="            FLAG_CVE_EQ_PVE, FLAG_CVE_EQ_PVE, FLAG_CVE_LT_PVE"
-        errorLine2="                             ~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="30"/>
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="13"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
         message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
         errorLine1="        return 0;"
@@ -715,35 +458,13 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
     <issue
@@ -768,15 +489,4 @@
             column="36"/>
     </issue>
 
-    <issue
-        id="WrongConstant"
-        message="Must be one of: View.LAYOUT_DIRECTION_LTR, View.LAYOUT_DIRECTION_RTL"
-        errorLine1="            return isAutoMirrored() &amp;&amp; getLayoutDirection() == LayoutDirection.RTL;"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="821"
-            column="64"/>
-    </issue>
-
 </issues>
diff --git a/v17/leanback/lint-baseline.xml b/v17/leanback/lint-baseline.xml
index d87e4b2..24cb762 100644
--- a/v17/leanback/lint-baseline.xml
+++ b/v17/leanback/lint-baseline.xml
@@ -57,72 +57,6 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
         id="LongLogTag"
         message="The logging tag can be at most 23 characters, was 27 (DetailsOverviewRowPresenter)"
         errorLine1="                if (DEBUG) Log.v(TAG, &quot;onLayoutChange &quot; + v);"
@@ -146,39 +80,6 @@
 
     <issue
         id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
         message="The logging tag can be at most 23 characters, was 36 (FullWidthDetailsOverviewRowPresenter)"
         errorLine1="                if (DEBUG) Log.v(TAG, &quot;onLayoutChange &quot; + v);"
         errorLine2="                                 ~~~">
@@ -206,7 +107,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="641"
+            line="642"
             column="19"/>
     </issue>
 
@@ -217,7 +118,7 @@
         errorLine2="                         ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="999"
+            line="1000"
             column="26"/>
     </issue>
 
@@ -228,7 +129,7 @@
         errorLine2="                         ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="1038"
+            line="1039"
             column="26"/>
     </issue>
 
@@ -239,7 +140,7 @@
         errorLine2="                         ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="1237"
+            line="1239"
             column="26"/>
     </issue>
 
@@ -250,7 +151,7 @@
         errorLine2="                             ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="1350"
+            line="1352"
             column="30"/>
     </issue>
 
@@ -261,7 +162,7 @@
         errorLine2="                      ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="1362"
+            line="1364"
             column="23"/>
     </issue>
 
@@ -399,127 +300,6 @@
 
     <issue
         id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;found saved state: &quot; + mPendingSavedState);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="783"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;Deciding anchor info from fresh state&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="828"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;invalid saved state class&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1187"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;saved state:\n&quot; + state);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1236"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;FILLING targetLine: &quot; + targetLine + &quot;,&quot;"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1559"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;assigned &quot; + currentSpan.mIndex + &quot; for &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1580"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;using &quot; + spanIndex + &quot; for pos &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1584"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;asked &quot; + dt + &quot; scrolled&quot; + totalScroll);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2153"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;Unknown focus request:&quot; + focusDirection);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2385"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
         message="The logging tag can be at most 23 characters, was 27 (VerticalGridSupportFragment)"
         errorLine1="            if (DEBUG) Log.v(TAG, &quot;grid selected position &quot; + position);"
         errorLine2="                             ~~~">
@@ -530,32 +310,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UniqueConstants"
-        message="Constants `FLAG_CVE_EQ_PVE` and `FLAG_CVE_EQ_PVE` specify the same exact value (8192); this is usually a cut &amp; paste or merge error"
-        errorLine1="            FLAG_CVE_EQ_PVE, FLAG_CVE_EQ_PVE, FLAG_CVE_LT_PVE"
-        errorLine2="                             ~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="30"/>
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="13"/>
-    </issue>
-
-    <issue
         id="Orientation"
         message="No orientation specified, and the default is horizontal. This is a common source of bugs when children are added dynamically."
         errorLine1="            &lt;LinearLayout"
@@ -590,35 +344,13 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
     <issue
@@ -639,7 +371,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~">
         <location
             file="src/android/support/v17/leanback/widget/GridLayoutManager.java"
-            line="3468"
+            line="3476"
             column="45"/>
     </issue>
 
diff --git a/v17/preference-leanback/lint-baseline.xml b/v17/preference-leanback/lint-baseline.xml
index 724d38a..923181b 100644
--- a/v17/preference-leanback/lint-baseline.xml
+++ b/v17/preference-leanback/lint-baseline.xml
@@ -127,17 +127,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="            final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                    ~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="557"
-            column="53"/>
-    </issue>
-
-    <issue
         id="Range"
         message="Value must be ≥ 0 (was -2147483648)"
         errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
@@ -160,72 +149,6 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </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; />"
@@ -447,39 +370,6 @@
 
     <issue
         id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
         message="The logging tag can be at most 23 characters, was 36 (FullWidthDetailsOverviewRowPresenter)"
         errorLine1="                if (DEBUG) Log.v(TAG, &quot;onLayoutChange &quot; + v);"
         errorLine2="                                 ~~~">
@@ -507,7 +397,7 @@
         errorLine2="                  ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="641"
+            line="642"
             column="19"/>
     </issue>
 
@@ -518,7 +408,7 @@
         errorLine2="                         ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="999"
+            line="1000"
             column="26"/>
     </issue>
 
@@ -529,7 +419,7 @@
         errorLine2="                         ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="1038"
+            line="1039"
             column="26"/>
     </issue>
 
@@ -540,7 +430,7 @@
         errorLine2="                         ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="1237"
+            line="1239"
             column="26"/>
     </issue>
 
@@ -551,7 +441,7 @@
         errorLine2="                             ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="1350"
+            line="1352"
             column="30"/>
     </issue>
 
@@ -562,7 +452,7 @@
         errorLine2="                      ~~~">
         <location
             file="src/android/support/v17/leanback/app/GuidedStepSupportFragment.java"
-            line="1362"
+            line="1364"
             column="23"/>
     </issue>
 
@@ -700,127 +590,6 @@
 
     <issue
         id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;found saved state: &quot; + mPendingSavedState);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="783"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;Deciding anchor info from fresh state&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="828"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;invalid saved state class&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1187"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;saved state:\n&quot; + state);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1236"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;FILLING targetLine: &quot; + targetLine + &quot;,&quot;"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1559"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;assigned &quot; + currentSpan.mIndex + &quot; for &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1580"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;using &quot; + spanIndex + &quot; for pos &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1584"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;asked &quot; + dt + &quot; scrolled&quot; + totalScroll);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2153"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;Unknown focus request:&quot; + focusDirection);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2385"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
         message="The logging tag can be at most 23 characters, was 27 (VerticalGridSupportFragment)"
         errorLine1="            if (DEBUG) Log.v(TAG, &quot;grid selected position &quot; + position);"
         errorLine2="                             ~~~">
@@ -831,17 +600,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="AppCompatCustomView"
         message="This custom view should extend `android.support.v7.widget.AppCompatAutoCompleteTextView` instead"
         errorLine1="public class AppCompatAutoCompleteTextView extends AutoCompleteTextView implements"
@@ -1073,21 +831,6 @@
     </issue>
 
     <issue
-        id="UniqueConstants"
-        message="Constants `FLAG_CVE_EQ_PVE` and `FLAG_CVE_EQ_PVE` specify the same exact value (8192); this is usually a cut &amp; paste or merge error"
-        errorLine1="            FLAG_CVE_EQ_PVE, FLAG_CVE_EQ_PVE, FLAG_CVE_LT_PVE"
-        errorLine2="                             ~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="30"/>
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="13"/>
-    </issue>
-
-    <issue
         id="Orientation"
         message="No orientation specified, and the default is horizontal. This is a common source of bugs when children are added dynamically."
         errorLine1="            &lt;LinearLayout"
@@ -1133,35 +876,13 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
     <issue
@@ -1182,7 +903,7 @@
         errorLine2="                                            ~~~~~~~~~~~~~~~~">
         <location
             file="src/android/support/v17/leanback/widget/GridLayoutManager.java"
-            line="3468"
+            line="3476"
             column="45"/>
     </issue>
 
@@ -1231,17 +952,6 @@
     </issue>
 
     <issue
-        id="WrongConstant"
-        message="Must be one of: View.LAYOUT_DIRECTION_LTR, View.LAYOUT_DIRECTION_RTL"
-        errorLine1="            return isAutoMirrored() &amp;&amp; getLayoutDirection() == LayoutDirection.RTL;"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="821"
-            column="64"/>
-    </issue>
-
-    <issue
         id="RtlCompat"
         message="Inconsistent alignment specification between `textAlignment` and `gravity` attributes: was `center_vertical`, expected `start`"
         errorLine1="            android:textAlignment=&quot;viewStart&quot; />"
diff --git a/v4/lint-baseline.xml b/v4/lint-baseline.xml
index 2a79d28..4d3d334 100644
--- a/v4/lint-baseline.xml
+++ b/v4/lint-baseline.xml
@@ -24,168 +24,14 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
 </issues>
diff --git a/v7/appcompat/lint-baseline.xml b/v7/appcompat/lint-baseline.xml
index 9436020..f0d1d20 100644
--- a/v7/appcompat/lint-baseline.xml
+++ b/v7/appcompat/lint-baseline.xml
@@ -94,17 +94,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="            final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                    ~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="557"
-            column="53"/>
-    </issue>
-
-    <issue
         id="Range"
         message="Value must be ≥ 0 (was -2147483648)"
         errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
@@ -127,72 +116,6 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </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);"
@@ -292,72 +215,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
         message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
         errorLine1="        return 0;"
@@ -370,35 +227,13 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
     <issue
@@ -423,15 +258,4 @@
             column="36"/>
     </issue>
 
-    <issue
-        id="WrongConstant"
-        message="Must be one of: View.LAYOUT_DIRECTION_LTR, View.LAYOUT_DIRECTION_RTL"
-        errorLine1="            return isAutoMirrored() &amp;&amp; getLayoutDirection() == LayoutDirection.RTL;"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="821"
-            column="64"/>
-    </issue>
-
 </issues>
diff --git a/v7/gridlayout/lint-baseline.xml b/v7/gridlayout/lint-baseline.xml
index 1c675b0..493c8c5 100644
--- a/v7/gridlayout/lint-baseline.xml
+++ b/v7/gridlayout/lint-baseline.xml
@@ -2,102 +2,14 @@
 <issues format="4" by="lint 2.4.0-alpha6">
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
 </issues>
diff --git a/v7/mediarouter/lint-baseline.xml b/v7/mediarouter/lint-baseline.xml
index edf2faf..fe44849 100644
--- a/v7/mediarouter/lint-baseline.xml
+++ b/v7/mediarouter/lint-baseline.xml
@@ -105,17 +105,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="            final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                    ~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="557"
-            column="53"/>
-    </issue>
-
-    <issue
         id="Range"
         message="Value must be ≥ 0 (was -2147483648)"
         errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
@@ -138,72 +127,6 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </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);"
@@ -304,39 +227,6 @@
 
     <issue
         id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </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; +"
         errorLine2="                  ~~~">
@@ -347,39 +237,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="AppCompatCustomView"
         message="This custom view should extend `android.support.v7.widget.AppCompatAutoCompleteTextView` instead"
         errorLine1="public class AppCompatAutoCompleteTextView extends AutoCompleteTextView implements"
@@ -568,35 +425,13 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
     <issue
@@ -621,15 +456,4 @@
             column="36"/>
     </issue>
 
-    <issue
-        id="WrongConstant"
-        message="Must be one of: View.LAYOUT_DIRECTION_LTR, View.LAYOUT_DIRECTION_RTL"
-        errorLine1="            return isAutoMirrored() &amp;&amp; getLayoutDirection() == LayoutDirection.RTL;"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="821"
-            column="64"/>
-    </issue>
-
 </issues>
diff --git a/v7/palette/lint-baseline.xml b/v7/palette/lint-baseline.xml
index d75d39e..172bbf6 100644
--- a/v7/palette/lint-baseline.xml
+++ b/v7/palette/lint-baseline.xml
@@ -1,37 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <issues format="4" by="lint 2.4.0-alpha6">
 
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
 </issues>
diff --git a/v7/preference/lint-baseline.xml b/v7/preference/lint-baseline.xml
index c9f4dab..eee7674 100644
--- a/v7/preference/lint-baseline.xml
+++ b/v7/preference/lint-baseline.xml
@@ -94,17 +94,6 @@
     </issue>
 
     <issue
-        id="ResourceType"
-        message="Expected resource of type xml"
-        errorLine1="            final XmlPullParser parser = res.getXml(resId);"
-        errorLine2="                                                    ~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="557"
-            column="53"/>
-    </issue>
-
-    <issue
         id="Range"
         message="Value must be ≥ 0 (was -2147483648)"
         errorLine1="                                MeasureSpec.makeMeasureSpec(largestChildHeight,"
@@ -127,72 +116,6 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </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;"
@@ -314,171 +237,6 @@
     </issue>
 
     <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Adding item #&quot; + position + &quot;: f=&quot; + fragment);"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="110"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="        if (DEBUG) Log.v(TAG, &quot;Removing item #&quot; + position + &quot;: f=&quot; + object"
-        errorLine2="                         ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="135"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 25 (FragmentStatePagerAdapter)"
-        errorLine1="                        Log.w(TAG, &quot;Bad fragment at key &quot; + key);"
-        errorLine2="                              ~~~">
-        <location
-            file="java/android/support/v4/app/FragmentStatePagerAdapter.java"
-            line="224"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + filepath);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="80"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 28 (RoundedBitmapDrawableFactory)"
-        errorLine1="            Log.w(TAG, &quot;RoundedBitmapDrawable cannot decode &quot; + is);"
-        errorLine2="                  ~~~">
-        <location
-            file="java/android/support/v4/graphics/drawable/RoundedBitmapDrawableFactory.java"
-            line="93"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;found saved state: &quot; + mPendingSavedState);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="783"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;Deciding anchor info from fresh state&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="828"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;invalid saved state class&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1187"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;saved state:\n&quot; + state);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1236"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;FILLING targetLine: &quot; + targetLine + &quot;,&quot;"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1559"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;assigned &quot; + currentSpan.mIndex + &quot; for &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1580"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;using &quot; + spanIndex + &quot; for pos &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1584"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;asked &quot; + dt + &quot; scrolled&quot; + totalScroll);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2153"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;Unknown focus request:&quot; + focusDirection);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2385"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 24 (WakefulBroadcastReceiver)"
-        errorLine1="            Log.w(&quot;WakefulBroadcastReceiver&quot;, &quot;No active wake lock id #&quot; + id);"
-        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/content/WakefulBroadcastReceiver.java"
-            line="141"
-            column="19"/>
-    </issue>
-
-    <issue
         id="AppCompatCustomView"
         message="This custom view should extend `android.support.v7.widget.AppCompatAutoCompleteTextView` instead"
         errorLine1="public class AppCompatAutoCompleteTextView extends AutoCompleteTextView implements"
@@ -655,21 +413,6 @@
     </issue>
 
     <issue
-        id="UniqueConstants"
-        message="Constants `FLAG_CVE_EQ_PVE` and `FLAG_CVE_EQ_PVE` specify the same exact value (8192); this is usually a cut &amp; paste or merge error"
-        errorLine1="            FLAG_CVE_EQ_PVE, FLAG_CVE_EQ_PVE, FLAG_CVE_LT_PVE"
-        errorLine2="                             ~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="30"/>
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="13"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
         message="Must be one of: PixelFormat.UNKNOWN, PixelFormat.TRANSLUCENT, PixelFormat.TRANSPARENT, PixelFormat.OPAQUE"
         errorLine1="        return 0;"
@@ -682,35 +425,13 @@
 
     <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
     <issue
@@ -735,15 +456,4 @@
             column="36"/>
     </issue>
 
-    <issue
-        id="WrongConstant"
-        message="Must be one of: View.LAYOUT_DIRECTION_LTR, View.LAYOUT_DIRECTION_RTL"
-        errorLine1="            return isAutoMirrored() &amp;&amp; getLayoutDirection() == LayoutDirection.RTL;"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/graphics/drawable/VectorDrawableCompat.java"
-            line="821"
-            column="64"/>
-    </issue>
-
 </issues>
diff --git a/v7/recyclerview/lint-baseline.xml b/v7/recyclerview/lint-baseline.xml
index 443b10a..493c8c5 100644
--- a/v7/recyclerview/lint-baseline.xml
+++ b/v7/recyclerview/lint-baseline.xml
@@ -2,216 +2,14 @@
 <issues format="4" by="lint 2.4.0-alpha6">
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;found saved state: &quot; + mPendingSavedState);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="783"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;Deciding anchor info from fresh state&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="828"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;invalid saved state class&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1187"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;saved state:\n&quot; + state);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1236"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;FILLING targetLine: &quot; + targetLine + &quot;,&quot;"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1559"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;assigned &quot; + currentSpan.mIndex + &quot; for &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1580"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;using &quot; + spanIndex + &quot; for pos &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1584"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;asked &quot; + dt + &quot; scrolled&quot; + totalScroll);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2153"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;Unknown focus request:&quot; + focusDirection);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2385"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UniqueConstants"
-        message="Constants `FLAG_CVE_EQ_PVE` and `FLAG_CVE_EQ_PVE` specify the same exact value (8192); this is usually a cut &amp; paste or merge error"
-        errorLine1="            FLAG_CVE_EQ_PVE, FLAG_CVE_EQ_PVE, FLAG_CVE_LT_PVE"
-        errorLine2="                             ~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="30"/>
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="13"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
 </issues>
diff --git a/v7/recyclerview/src/android/support/v7/widget/StaggeredGridLayoutManager.java b/v7/recyclerview/src/android/support/v7/widget/StaggeredGridLayoutManager.java
index 679f483..f3ea045 100644
--- a/v7/recyclerview/src/android/support/v7/widget/StaggeredGridLayoutManager.java
+++ b/v7/recyclerview/src/android/support/v7/widget/StaggeredGridLayoutManager.java
@@ -55,7 +55,7 @@
 public class StaggeredGridLayoutManager extends RecyclerView.LayoutManager implements
         RecyclerView.SmoothScroller.ScrollVectorProvider {
 
-    private static final String TAG = "StaggeredGridLayoutManager";
+    private static final String TAG = "StaggeredGridLManager";
 
     static final boolean DEBUG = false;
 
diff --git a/v7/recyclerview/src/android/support/v7/widget/ViewBoundsCheck.java b/v7/recyclerview/src/android/support/v7/widget/ViewBoundsCheck.java
index 8a4f89c..191a069 100644
--- a/v7/recyclerview/src/android/support/v7/widget/ViewBoundsCheck.java
+++ b/v7/recyclerview/src/android/support/v7/widget/ViewBoundsCheck.java
@@ -122,7 +122,7 @@
             FLAG_CVS_GT_PVS, FLAG_CVS_EQ_PVS, FLAG_CVS_LT_PVS,
             FLAG_CVS_GT_PVE, FLAG_CVS_EQ_PVE, FLAG_CVS_LT_PVE,
             FLAG_CVE_GT_PVS, FLAG_CVE_EQ_PVS, FLAG_CVE_LT_PVS,
-            FLAG_CVE_EQ_PVE, FLAG_CVE_EQ_PVE, FLAG_CVE_LT_PVE
+            FLAG_CVE_GT_PVE, FLAG_CVE_EQ_PVE, FLAG_CVE_LT_PVE
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface ViewBounds {}
diff --git a/wear/lint-baseline.xml b/wear/lint-baseline.xml
index ba39be4..962399c 100644
--- a/wear/lint-baseline.xml
+++ b/wear/lint-baseline.xml
@@ -28,216 +28,14 @@
     </issue>
 
     <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.AT_MOST);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="536"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight, MeasureSpec.EXACTLY);"
-        errorLine2="                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="538"
-            column="63"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="586"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                                childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                              ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="589"
-            column="79"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="608"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="Range"
-        message="Value must be ≥ 0 (was -1)"
-        errorLine1="                            childHeightSpec = MeasureSpec.makeMeasureSpec(maxLayoutHeight,"
-        errorLine2="                                                                          ~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/SlidingPaneLayout.java"
-            line="611"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;found saved state: &quot; + mPendingSavedState);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="783"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;Deciding anchor info from fresh state&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="828"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;invalid saved state class&quot;);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1187"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;saved state:\n&quot; + state);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1236"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;FILLING targetLine: &quot; + targetLine + &quot;,&quot;"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1559"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;assigned &quot; + currentSpan.mIndex + &quot; for &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1580"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;using &quot; + spanIndex + &quot; for pos &quot; + position);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="1584"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="            Log.d(TAG, &quot;asked &quot; + dt + &quot; scrolled&quot; + totalScroll);"
-        errorLine2="                  ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2153"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="LongLogTag"
-        message="The logging tag can be at most 23 characters, was 26 (StaggeredGridLayoutManager)"
-        errorLine1="                    Log.d(TAG, &quot;Unknown focus request:&quot; + focusDirection);"
-        errorLine2="                          ~~~">
-        <location
-            file="src/android/support/v7/widget/StaggeredGridLayoutManager.java"
-            line="2385"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UniqueConstants"
-        message="Constants `FLAG_CVE_EQ_PVE` and `FLAG_CVE_EQ_PVE` specify the same exact value (8192); this is usually a cut &amp; paste or merge error"
-        errorLine1="            FLAG_CVE_EQ_PVE, FLAG_CVE_EQ_PVE, FLAG_CVE_LT_PVE"
-        errorLine2="                             ~~~~~~~~~~~~~~~">
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="30"/>
-        <location
-            file="src/android/support/v7/widget/ViewBoundsCheck.java"
-            line="125"
-            column="13"/>
-    </issue>
-
-    <issue
         id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        setDrawerLockMode(lockMode, gravity);"
-        errorLine2="                                    ~~~~~~~">
+        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="                                              ~~~~~~~~~~~~">
         <location
             file="java/android/support/v4/widget/DrawerLayout.java"
-            line="680"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Must be one of: Gravity.LEFT, Gravity.RIGHT, GravityCompat.START, GravityCompat.END"
-        errorLine1="        return getDrawerLockMode(drawerGravity);"
-        errorLine2="                                 ~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="753"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        message="Flag not allowed here"
-        errorLine1="                        getDrawerViewAbsoluteGravity(child) &amp; Gravity.HORIZONTAL_GRAVITY_MASK;"
-        errorLine2="                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="java/android/support/v4/widget/DrawerLayout.java"
-            line="1086"
-            column="25"/>
+            line="1075"
+            column="47"/>
     </issue>
 
 </issues>