Merge \"ServiceConnection: Properly serialize events\" into nyc-mr1-dev
am: 1dcda85414

Change-Id: I8dd496db509da805a22ad59dbc8e98df0c1052d5