Merge "Fix certain BatteryStatsTests and enable presubmit" into sc-dev