Merge "Make Connection.Listener methods package private."