Merge "Add some wifi tracking to battery stats."