am c73c92b4: Merge "Remove dead code, mostly DataStateTracker."

* commit 'c73c92b49cc7b974b31e933bbd15ee2e20771a5f':
  Remove dead code, mostly DataStateTracker.