Merge "Fix some uid issues in battery stats."