Merge 10.5.A.0.230 changes: Fix event to enter recovery

This should match the new 4.4.2 event modified and added to kernel

Change-Id: I415b03b7e2cd0df1a93b30599f63ff313ab55768