Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev