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

* commit '8c4b4780838d4793db6459c4ceaeddea9afd1962':
  Make connection states a proper type.