Merge "Track USB data link in batterystats" into pi-dev