am f53c7af1: (-s ours) am be1f5732: am f4bda753: Merge "Add feature list to connection banner."

* commit 'f53c7af1563dae58d19f1c59fe4a57ab3171e5af':