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

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