DO NOT MERGE Add connect event reporting am: c429e71cfe
am: 37012db6d0  -s ours

Change-Id: Ia41d506de553869203e4e0c45530f8c62364f2f8