diff --git a/device/arista/x86_64-arista_7050_qx32/sensors.conf b/device/arista/x86_64-arista_7050_qx32/sensors.conf
index 469f63eaf1e4..481c9ec30114 100644
--- a/device/arista/x86_64-arista_7050_qx32/sensors.conf
+++ b/device/arista/x86_64-arista_7050_qx32/sensors.conf
@@ -2,11 +2,11 @@
 # ------------------------------------------------
 #
 
-bus "i2c-2" "SCD SMBus master 0 bus 0"
-bus "i2c-3" "SCD SMBus master 0 bus 1"
-bus "i2c-5" "SCD SMBus master 0 bus 3"
-bus "i2c-6" "SCD SMBus master 0 bus 4"
-bus "i2c-7" "SCD SMBus master 0 bus 5"
+bus "i2c-2" "SCD 0000:04:00.0 SMBus master 0 bus 0"
+bus "i2c-3" "SCD 0000:04:00.0 SMBus master 0 bus 1"
+bus "i2c-5" "SCD 0000:04:00.0 SMBus master 0 bus 3"
+bus "i2c-6" "SCD 0000:04:00.0 SMBus master 0 bus 4"
+bus "i2c-7" "SCD 0000:04:00.0 SMBus master 0 bus 5"
 
 chip "k10temp-pci-00c3"
     label temp1 "Cpu temp sensor"
diff --git a/device/arista/x86_64-arista_7050_qx32s/sensors.conf b/device/arista/x86_64-arista_7050_qx32s/sensors.conf
index 9c2dd38597a3..6030de90eea5 100644
--- a/device/arista/x86_64-arista_7050_qx32s/sensors.conf
+++ b/device/arista/x86_64-arista_7050_qx32s/sensors.conf
@@ -2,11 +2,11 @@
 # ------------------------------------------------
 #
 
-bus "i2c-2" "SCD SMBus master 0 bus 0"
-bus "i2c-3" "SCD SMBus master 0 bus 1"
-bus "i2c-5" "SCD SMBus master 0 bus 3"
-bus "i2c-6" "SCD SMBus master 0 bus 4"
-bus "i2c-7" "SCD SMBus master 0 bus 5"
+bus "i2c-2" "SCD 0000:02:00.0 SMBus master 0 bus 0"
+bus "i2c-3" "SCD 0000:02:00.0 SMBus master 0 bus 1"
+bus "i2c-5" "SCD 0000:02:00.0 SMBus master 0 bus 3"
+bus "i2c-6" "SCD 0000:02:00.0 SMBus master 0 bus 4"
+bus "i2c-7" "SCD 0000:02:00.0 SMBus master 0 bus 5"
 
 chip "k10temp-pci-00c3"
     label temp1 "Cpu temp sensor"
diff --git a/files/Aboot/boot0.j2 b/files/Aboot/boot0.j2
index 435781a77485..f64c111338d6 100644
--- a/files/Aboot/boot0.j2
+++ b/files/Aboot/boot0.j2
@@ -206,8 +206,7 @@ write_boot_configs() {
     elif [ ! -f "$cmdline_base" ]; then
         # some systems were started with other versions of this script and therefore
         # do not have the $cmdline_base file. we assume that we are on Sonic or EOS.
-        cat /proc/cmdline > $cmdline_base
-        sed -Ei 's/^(.*) rw .*$/\1/' $cmdline_base
+        cat /proc/cmdline | sed -E 's/^(.*) rw .*$/\1/' | tr ' ' '\n' > $cmdline_base
     fi
 
     cp $cmdline_base /tmp/append
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 6fe9de4dd52b..4944abe0e852 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 6fe9de4dd52bba4c5856567a8f5624e75e9af66d
+Subproject commit 4944abe0e852221ba5562dfe6ae3bbc7d4ee55a5