Recovery fix event

Change-Id: I5e1f04872835b2ac1d99cf7bdf97b37d43ced5f2
Again fix cwm

Change-Id: Idd6488d2cf4e22b5c714c41175a1ce4c4771e430