am be1f5732: am f4bda753: Merge "Add feature list to connection banner."

* commit 'be1f57325f6fe1702b0d18fcdb21efe4731a191d':
  Add feature list to connection banner.