Merge "Remove libbatteryservice."