am 2f196e6c: Merge "Remove dead code, mostly DataStateTracker."

* commit '2f196e6c81e50b70d56c1cc06fd2aec147b58ed8':
  Remove dead code, mostly DataStateTracker.