Merge "Transition BatteryStatsLoadTests to BatteryUsageStats API" into sc-dev