Merge "Move battery stats to xt_qtaguid for data stats."