diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index fdf9ef83..afbe85c5 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -35,6 +35,7 @@ TARGET_CPU_VARIANT_RUNTIME := cortex-a53
 BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
 BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
+BOARD_KERNEL_CMDLINE += cgroup_disable=memory
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 
 TARGET_NO_BOOTLOADER := true
diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 88ddb73c..5896a968 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -214,6 +214,8 @@ on init
     chown system system /sys/devices/platform/10970000.hsi2c/i2c-5/5-0050/eeprom
     chown system system /sys/devices/platform/10970000.hsi2c/i2c-4/4-0050/eeprom
     chown system system /sys/devices/platform/10da0000.hsi2c/i2c-6/6-0050/eeprom
+    chown system system /dev/battery_history
+    chmod 0644 /dev/battery_history
 
     # Modem temperature driver
     chown radio system /sys/devices/platform/cp-tm1/cp_temp
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 5ea7c7ea..dc1f72b6 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -62,15 +62,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-	<hal format="hidl">
-		<name>android.hardware.renderscript</name>
-		<transport arch="32+64">passthrough</transport>
-		<version>1.0</version>
-		<interface>
-			<name>IDevice</name>
-			<instance>default</instance>
-		</interface>
-	</hal>
     <hal format="hidl">
         <name>android.hardware.drm</name>
         <transport>hwbinder</transport>
diff --git a/manifest.xml b/manifest.xml
index 716d5bf1..72da40d4 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -53,15 +53,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.renderscript</name>
-        <transport arch="32+64">passthrough</transport>
-        <version>1.0</version>
-        <interface>
-            <name>IDevice</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format = "hidl">
         <name>android.hardware.dumpstate</name>
         <transport>hwbinder</transport>
diff --git a/pixelstats/service.cpp b/pixelstats/service.cpp
index 6a4a3a8e..23ae5f76 100644
--- a/pixelstats/service.cpp
+++ b/pixelstats/service.cpp
@@ -35,12 +35,14 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
     .SlowioWriteCntPath = UFSHC_PATH(slowio_write_cnt),
     .SlowioUnmapCntPath = UFSHC_PATH(slowio_unmap_cnt),
     .SlowioSyncCntPath = UFSHC_PATH(slowio_sync_cnt),
+    .CycleCountBinsPath = "/sys/class/power_supply/battery/cycle_counts",
     .UFSLifetimeA = UFSHC_PATH(health_descriptor/life_time_estimation_a),
     .UFSLifetimeB = UFSHC_PATH(health_descriptor/life_time_estimation_b),
     .UFSLifetimeC = UFSHC_PATH(health_descriptor/life_time_estimation_c),
     .F2fsStatsPath = "/sys/fs/f2fs/",
     .ImpedancePath = "/sys/devices/platform/audiometrics/speaker_impedance",
     .CodecPath =     "/sys/devices/platform/audiometrics/codec_state",
+    .EEPROMPath = "/dev/battery_history",
     .SpeakerTemperaturePath = "/sys/devices/platform/audiometrics/speaker_temp",
     .SpeakerExcursionPath = "/sys/devices/platform/audiometrics/speaker_excursion",
     .SpeakerHeartBeatPath = "/sys/devices/platform/audiometrics/speaker_heartbeat",
@@ -57,7 +59,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
 
 const struct UeventListener::UeventPaths ueventPaths = {
         .AudioUevent = "/devices/virtual/amcs/amcs",
-};
+        .WirelessChargerPtmcPath = "/sys/class/power_supply/wireless/device/ptmc_id",
+        .TypeCPartnerUevent = "PRODUCT_TYPE="};
 
 int main() {
     LOG(INFO) << "starting PixelStats";