Merge "Fix array lengths swapped in WifiBatteryStats"