Merge "Add BatteryFix Slice"