Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev