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

* commit '0001d4fbaf09de60e550699e739cf27cac70280e':
  Remove dead code, mostly DataStateTracker.