Merge "Merge "Make Connection.Listener methods package private." am: 9c3abc4692 am: 48c29257d3 am: 8d6e633a6e"