changes toward event edit

Change-Id: I6871a198cda009e053402c6d1fc8ba3c9925f022