am dfd1a3d4: am d92fd41f: Merge "Make connection states a proper type."

* commit 'dfd1a3d43cfe937fa038f4f22f8d00431226a7d1':
  Make connection states a proper type.