Merge \"Add EVENT_CALL_MERGE_FAILED Connection Event\" into nyc-mr1-dev
am: a3d4baf43b

Change-Id: I56f5854a39325671b1854ce453a416eb24b9c8a8