Merge "Remove build time dependency from BatteryStats to JobParameters"