Merge "Fix R for BatteryInfo"