Merge "Fix and re-enable BatteryStatsCpuTimesTest" into sc-dev