Merge "Remove dead code, mostly DataStateTracker." into m-wireless-dev