Support public key connections

Change-Id: I01b8f9f2e25fdb8f796af1f1eb297b6b6c938c4a