diff --git a/car-broadcastradio-support/Android.mk b/car-broadcastradio-support/Android.mk
index 11b01ae..ac4d663 100644
--- a/car-broadcastradio-support/Android.mk
+++ b/car-broadcastradio-support/Android.mk
@@ -30,8 +30,12 @@
 LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_USE_AAPT2 := true
 
-LOCAL_STATIC_ANDROID_LIBRARIES := \
+LOCAL_SHARED_ANDROID_LIBRARIES := \
     android-support-v4 \
     car-media-common
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
+
+ifeq ($(BOARD_IS_AUTOMOTIVE), true)
+$(call dist-for-goals,dist_files,$(full_classes_jar):$(LOCAL_MODULE).jar)
+endif
diff --git a/car-broadcastradio-support/src/com/android/car/broadcastradio/support/platform/ProgramSelectorExt.java b/car-broadcastradio-support/src/com/android/car/broadcastradio/support/platform/ProgramSelectorExt.java
index 6d07437..1eff91f 100644
--- a/car-broadcastradio-support/src/com/android/car/broadcastradio/support/platform/ProgramSelectorExt.java
+++ b/car-broadcastradio-support/src/com/android/car/broadcastradio/support/platform/ProgramSelectorExt.java
@@ -201,8 +201,11 @@
      * @return new ProgramSelector object representing given frequency.
      * @throws IllegalArgumentException if provided frequency is out of bounds.
      */
-    public static @NonNull ProgramSelector createAmFmSelector(int frequencyKhz) {
-        return ProgramSelector.createAmFmSelector(RadioManager.BAND_INVALID, frequencyKhz);
+    public static @NonNull ProgramSelector createAmFmSelector(long frequencyKhz) {
+        if (frequencyKhz < 0 || frequencyKhz > Integer.MAX_VALUE) {
+            throw new IllegalArgumentException("illegal frequency value: " + frequencyKhz);
+        }
+        return ProgramSelector.createAmFmSelector(RadioManager.BAND_INVALID, (int) frequencyKhz);
     }
 
     /**
diff --git a/car-settings-lib/res/values-night/colors.xml b/car-settings-lib/res/values-night/colors.xml
index 080de93..cc91575 100644
--- a/car-settings-lib/res/values-night/colors.xml
+++ b/car-settings-lib/res/values-night/colors.xml
@@ -15,7 +15,7 @@
     limitations under the License.
 -->
 <resources>
-    <color name="windowBackground">@color/car_dark_blue_grey_700</color>
+    <color name="windowBackground">#121214</color>
     <color name="colorPrimaryDark">@color/car_dark_blue_grey_800</color>
 
     <color name="blue_600">@color/blue_600_light</color>