Merge "Use default package in BatteryEntry" into oc-dev