Merge "ServiceConnection: Properly serialize events" into nyc-mr1-dev