diff --git a/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java b/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java
index 9e3faec..9781318 100644
--- a/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java
+++ b/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java
@@ -27,7 +27,10 @@
  *
  * <p>By default, the {@link Toolbar} eats all touches on it. This view will override
  * {@link #onTouchEvent(MotionEvent)} and return {@code false} if configured to allow pass through.
+ *
+ * @deprecated Use {@link com.android.car.chassis.Toolbar} instead
  */
+@Deprecated
 public class ClickThroughToolbar extends Toolbar {
     private boolean mAllowClickPassThrough;
 
diff --git a/car-apps-common/src/com/android/car/apps/common/widget/CarTabLayout.java b/car-apps-common/src/com/android/car/apps/common/widget/CarTabLayout.java
index bf2c2b4..2184907 100644
--- a/car-apps-common/src/com/android/car/apps/common/widget/CarTabLayout.java
+++ b/car-apps-common/src/com/android/car/apps/common/widget/CarTabLayout.java
@@ -59,7 +59,9 @@
  * <p>Touch feedback is using @android:attr/selectableItemBackground.
  *
  * @param <T> Presents a CarTab entity
+ * @deprecated Use {@link com.android.car.chassis.TabLayout} instead
  */
+@Deprecated
 public class CarTabLayout<T extends CarTabLayout.CarTab> extends LinearLayout {
 
     /**
diff --git a/car-chassis-lib/res/layout/chassis_toolbar.xml b/car-chassis-lib/res/layout/chassis_toolbar.xml
index 56559f7..57056fb 100644
--- a/car-chassis-lib/res/layout/chassis_toolbar.xml
+++ b/car-chassis-lib/res/layout/chassis_toolbar.xml
@@ -25,7 +25,7 @@
         android:id="@+id/nav_icon_container"
         style="@style/ChassisToolbarNavIconContainerStyle"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/bottom_styleable"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_styleable"
         app:layout_constraintStart_toStartOf="parent">
         <ImageView
             android:id="@+id/nav_icon"
@@ -41,9 +41,9 @@
         android:layout_height="wrap_content"
         style="@style/ChassisToolbarTitleStyle"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/bottom_styleable"
-        app:layout_constraintStart_toEndOf="@id/nav_icon_container"
-        app:layout_constraintEnd_toStartOf="@id/buttons_container"/>
+        app:layout_constraintBottom_toTopOf="@+id/bottom_styleable"
+        app:layout_constraintStart_toEndOf="@+id/nav_icon_container"
+        app:layout_constraintEnd_toStartOf="@+id/buttons_container"/>
 
     <com.android.car.chassis.TabLayout
         android:id="@+id/tabs"
@@ -51,11 +51,10 @@
         android:layout_height="0dp"
         android:layout_marginEnd="@dimen/chassis_toolbar_custom_button_margin"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/bottom_styleable"
-        app:layout_constraintStart_toEndOf="@id/nav_icon_container"
-        app:layout_constraintEnd_toStartOf="@id/buttons_container"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constrainedWidth="true"/>
+        app:layout_constraintBottom_toTopOf="@+id/bottom_styleable"
+        app:layout_constraintStart_toEndOf="@+id/nav_icon_container"
+        app:layout_constraintEnd_toStartOf="@+id/buttons_container"
+        app:layout_constraintHorizontal_bias="0.0"/>
 
     <FrameLayout
         android:id="@+id/custom_view_container"
@@ -63,9 +62,9 @@
         android:layout_height="0dp"
         android:visibility="gone"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/bottom_styleable"
-        app:layout_constraintStart_toEndOf="@id/nav_icon_container"
-        app:layout_constraintEnd_toStartOf="@id/buttons_container"/>
+        app:layout_constraintBottom_toTopOf="@+id/bottom_styleable"
+        app:layout_constraintStart_toEndOf="@+id/nav_icon_container"
+        app:layout_constraintEnd_toStartOf="@+id/buttons_container"/>
 
     <LinearLayout
         android:id="@+id/buttons_container"
@@ -73,7 +72,7 @@
         android:layout_height="0dp"
         android:orientation="horizontal"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/bottom_styleable"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_styleable"
         app:layout_constraintEnd_toEndOf="parent"/>
 
     <com.android.car.chassis.SearchView
@@ -82,9 +81,9 @@
         android:layout_height="match_parent"
         android:visibility="gone"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/bottom_styleable"
-        app:layout_constraintStart_toEndOf="@id/nav_icon_container"
-        app:layout_constraintEnd_toStartOf="@id/buttons_container"/>
+        app:layout_constraintBottom_toTopOf="@+id/bottom_styleable"
+        app:layout_constraintStart_toEndOf="@+id/nav_icon_container"
+        app:layout_constraintEnd_toStartOf="@+id/buttons_container"/>
 
     <View
         android:id="@+id/bottom_styleable"
diff --git a/car-chassis-lib/res/values/strings.xml b/car-chassis-lib/res/values/strings.xml
index dd6770a..b93e4a1 100644
--- a/car-chassis-lib/res/values/strings.xml
+++ b/car-chassis-lib/res/values/strings.xml
@@ -14,5 +14,6 @@
 limitations under the License.
 -->
 <resources>
+    <!-- Search hint, displayed inside the search box [CHAR LIMIT=50] -->
     <string name="chassis_default_search_hint">Search&#8230;</string>
 </resources>