Merge "Modify sendConnectionEvent API calls." into nyc-dev