Merge "of: batterydata: remove return from macro."